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, 4 insertions, 2 deletions

diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 0d75986bb6..e6e0fa1175 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -213,12 +213,14 @@ static void matrix_blit_char(const int row, const int col, int cha)
 
     if (matrix[row][col].bold == 1) {
         rb->lcd_bitmap_part(matrix_bold, cha*COL_W, 0, 
-                STRIDE(BMPWIDTH_matrix_bold, BMPHEIGHT_matrix_bold),
+                STRIDE( SCREEN_MAIN, 
+                        BMPWIDTH_matrix_bold, BMPHEIGHT_matrix_bold),
                 col*COL_W + LEFTMARGIN, row*COL_H + TOPMARGIN, COL_W, COL_H);
     }
     else {
         rb->lcd_bitmap_part(matrix_normal, cha*COL_W, 0, 
-                STRIDE(BMPWIDTH_matrix_normal, BMPHEIGHT_matrix_normal),
+                STRIDE( SCREEN_MAIN, 
+                        BMPWIDTH_matrix_normal, BMPHEIGHT_matrix_normal),
                 col*COL_W + LEFTMARGIN, row*COL_H + TOPMARGIN, COL_W, COL_H);
     }
 }