summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-10-02 23:26:01 +0100
committerAidan MacDonald <amachronic@protonmail.com>2022-11-10 06:37:41 -0500
commit56389b21b13b4f177fdb2f3cdb0ee291278355f8 (patch)
treed6344b98330eddf90c2280e2544380425a79eed6
parent2c1adac3f8f794ca01e7b2a1a8154ee9e5df2724 (diff)
downloadrockbox-56389b21b13b4f177fdb2f3cdb0ee291278355f8.tar.gz
rockbox-56389b21b13b4f177fdb2f3cdb0ee291278355f8.zip
skin engine: Remove gui_img viewport field
This is set but never used. Change-Id: Ifbeaa843ef070ea178cc270ffcade0d57a4fb45f
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
-rw-r--r--apps/gui/skin_engine/wps_internals.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 2eef2af7c0..419e49810d 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -427,9 +427,6 @@ static int parse_image_load(struct skin_element *element,
427 img->is_9_segment = false; 427 img->is_9_segment = false;
428 img->loaded = false; 428 img->loaded = false;
429 429
430 /* save current viewport */
431 img->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp);
432
433 if (token->type == SKIN_TOKEN_IMAGE_DISPLAY) 430 if (token->type == SKIN_TOKEN_IMAGE_DISPLAY)
434 token->value.data = PTRTOSKINOFFSET(skin_buffer, img); 431 token->value.data = PTRTOSKINOFFSET(skin_buffer, img);
435 432
@@ -1170,7 +1167,6 @@ static int parse_progressbar_tag(struct skin_element* element,
1170 img->display = -1; 1167 img->display = -1;
1171 img->using_preloaded_icons = false; 1168 img->using_preloaded_icons = false;
1172 img->buflib_handle = -1; 1169 img->buflib_handle = -1;
1173 img->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp);
1174 img->loaded = false; 1170 img->loaded = false;
1175 struct skin_token_list *item = new_skin_token_list_item(NULL, img); 1171 struct skin_token_list *item = new_skin_token_list_item(NULL, img);
1176 if (!item) 1172 if (!item)
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 0ae2e24235..2506688659 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -81,7 +81,6 @@ struct skin_token_list {
81}; 81};
82 82
83struct gui_img { 83struct gui_img {
84 OFFSETTYPE(struct viewport*) vp; /* The viewport to display this image in */
85 short int x; /* x-pos */ 84 short int x; /* x-pos */
86 short int y; /* y-pos */ 85 short int y; /* y-pos */
87 short int num_subimages; /* number of sub-images */ 86 short int num_subimages; /* number of sub-images */