Fix STRIDE macro for multiscreen and add stride support for picture lib.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 10 insertions, 6 deletions

diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index 74af4a0d90..53cfd87774 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -144,19 +144,20 @@ void screen_put_iconxy(struct screen * display,
             return;
         }
         data    = viewer_iconset[screen].data;
-        stride  = STRIDE(   viewer_iconset[screen].width, 
+        stride  = STRIDE(   display->screen_type, viewer_iconset[screen].width, 
                             viewer_iconset[screen].height);
     }
     else if (custom_icons_loaded[screen])
     {
         data    = user_iconset[screen].data;
-        stride  = STRIDE(   user_iconset[screen].width, 
+        stride  = STRIDE(   display->screen_type, user_iconset[screen].width, 
                             user_iconset[screen].height);
     }
     else
     {
         data    = inbuilt_icons[screen];
-        stride  = STRIDE(BMPWIDTH_default_icons, BMPHEIGHT_default_icons);
+        stride  = STRIDE(   display->screen_type, BMPWIDTH_default_icons,
+                            BMPHEIGHT_default_icons);
     }
     /* add some left padding to the icons if they are on the edge */
     if (xpos == 0)
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 193bb4b65a..2e807002f0 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -202,7 +202,8 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x,
 #if LCD_DEPTH > 1
       else
         screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0,
-                                        STRIDE(bm.width, bm.height), 
+                                        STRIDE(screen->screen_type, 
+                                            bm.width, bm.height), 
                                         x + start, y, size, height);
 #endif
     } else {
@@ -214,7 +215,8 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x,
 #if LCD_DEPTH > 1
       else
         screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0,
-                                        STRIDE(bm.width, bm.height), 
+                                        STRIDE(screen->screen_type, 
+                                            bm.width, bm.height), 
                                         x, y + start, width, size);
 #endif
     }
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 0a43a19b90..01f8b13acb 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -232,7 +232,8 @@ static void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, int subima
     } else {
         display->transparent_bitmap_part((fb_data *)img->bm.data,
                                          0, img->subimage_height * subimage,
-                                         STRIDE(img->bm.width, img->bm.height), 
+                                         STRIDE(display->screen_type, 
+                                            img->bm.width, img->bm.height), 
                                          img->x, img->y, img->bm.width,
                                          img->subimage_height);
     }