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

1 files changed, 14 insertions, 2 deletions

diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 3d391d6685..3f3d8f875f 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -306,13 +306,25 @@ static inline unsigned lcd_color_to_native(unsigned color)
 
 #endif /* HAVE_LCD_COLOR */
 
+enum screen_type {
+    SCREEN_MAIN
+#ifdef HAVE_REMOTE_LCD
+    ,SCREEN_REMOTE
+#endif
+};
+
 /* Frame buffer stride */
+#define STRIDE_REMOTE(w, h)    (w)
+
 #if   defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
-#define STRIDE(w, h)    (h)
+#define STRIDE_MAIN(w, h)    (h)
 #else
-#define STRIDE(w, h)    (w)
+#define STRIDE_MAIN(w, h)    (w)
 #endif
 
+#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \
+                                        (h)):STRIDE_REMOTE((w),(h)))
+
 /* Frame buffer dimensions */
 #if LCD_DEPTH == 1
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING