diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
commit | 25123570c76f2055d3ae05d79741038c0e23c536 (patch) | |
tree | a2edd8351a611b9cef0aef08c880a994d9e1d75e /firmware/drivers | |
parent | f6025186fd1f6d9083c07568bc3d160f3e8774f8 (diff) | |
download | rockbox-25123570c76f2055d3ae05d79741038c0e23c536.tar.gz rockbox-25123570c76f2055d3ae05d79741038c0e23c536.zip |
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
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/lcd-16bit-vert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c index 396e6f88d8..887505766c 100644 --- a/firmware/drivers/lcd-16bit-vert.c +++ b/firmware/drivers/lcd-16bit-vert.c | |||
@@ -69,7 +69,7 @@ static struct viewport default_vp = | |||
69 | 69 | ||
70 | /* The Gigabeat target build requires access to the current fg_pattern | 70 | /* The Gigabeat target build requires access to the current fg_pattern |
71 | in lcd-meg-fx.c */ | 71 | in lcd-meg-fx.c */ |
72 | #if (!defined(TOSHIBA_GIGABEAT_F)&& !defined(TOSHIBA_GIGABEAT_S)) || defined(SIMULATOR) | 72 | #if defined(SIMULATOR) |
73 | static struct viewport* current_vp IDATA_ATTR = &default_vp; | 73 | static struct viewport* current_vp IDATA_ATTR = &default_vp; |
74 | #else | 74 | #else |
75 | struct viewport* current_vp IDATA_ATTR = &default_vp; | 75 | struct viewport* current_vp IDATA_ATTR = &default_vp; |
@@ -853,7 +853,7 @@ void ICODE_ATTR lcd_bitmap_part(const fb_data *src, int src_x, int src_y, | |||
853 | /* Draw a full native bitmap */ | 853 | /* Draw a full native bitmap */ |
854 | void lcd_bitmap(const fb_data *src, int x, int y, int width, int height) | 854 | void lcd_bitmap(const fb_data *src, int x, int y, int width, int height) |
855 | { | 855 | { |
856 | lcd_bitmap_part(src, 0, 0, STRIDE(width, height), x, y, width, height); | 856 | lcd_bitmap_part(src, 0, 0, STRIDE(SCREEN_MAIN, width, height), x, y, width, height); |
857 | } | 857 | } |
858 | 858 | ||
859 | #if !defined(TOSHIBA_GIGABEAT_F) && !defined(TOSHIBA_GIGABEAT_S) \ | 859 | #if !defined(TOSHIBA_GIGABEAT_F) && !defined(TOSHIBA_GIGABEAT_S) \ |
@@ -914,7 +914,7 @@ void lcd_bitmap_transparent(const fb_data *src, int x, int y, | |||
914 | int width, int height) | 914 | int width, int height) |
915 | { | 915 | { |
916 | lcd_bitmap_transparent_part(src, 0, 0, | 916 | lcd_bitmap_transparent_part(src, 0, 0, |
917 | STRIDE(width, height), x, y, width, height); | 917 | STRIDE(SCREEN_MAIN, width, height), x, y, width, height); |
918 | } | 918 | } |
919 | 919 | ||
920 | #include "lcd-bitmap-common.c" | 920 | #include "lcd-bitmap-common.c" |