diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-10-11 23:26:17 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-10-11 23:26:17 +0000 |
commit | fa0ea19d5a31946c08f44d1e3320ca5399ba51eb (patch) | |
tree | 05128c7228a8cc3a74830f0b38eb65563a8bb2f0 | |
parent | dc708c32a4fcb88edf7c7bcc34098cb7088757e5 (diff) | |
download | rockbox-fa0ea19d5a31946c08f44d1e3320ca5399ba51eb.tar.gz rockbox-fa0ea19d5a31946c08f44d1e3320ca5399ba51eb.zip |
Fixed the problem with the backdrops on iPod. The same problem was in the updated color picker and that is fixed too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11195 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/color_picker.c | 10 | ||||
-rw-r--r-- | apps/recorder/bmp.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 06653976a6..76c47fe376 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -72,14 +72,14 @@ static void unpack_rgb(struct rgb_pick *rgb) | |||
72 | { | 72 | { |
73 | unsigned color = rgb->color; | 73 | unsigned color = rgb->color; |
74 | #if LCD_PIXELFORMAT == RGB565SWAPPED | 74 | #if LCD_PIXELFORMAT == RGB565SWAPPED |
75 | swap16(color); | 75 | color = swap16(color); |
76 | #endif | 76 | #endif |
77 | rgb->r = (color & 0xf800) >> 11; | ||
78 | rgb->g = (color & 0x07e0) >> 5; | ||
79 | rgb->b = (color & 0x001f); | ||
80 | rgb->red = _RGB_UNPACK_RED(color); | 77 | rgb->red = _RGB_UNPACK_RED(color); |
81 | rgb->green = _RGB_UNPACK_GREEN(color); | 78 | rgb->green = _RGB_UNPACK_GREEN(color); |
82 | rgb->blue = _RGB_UNPACK_BLUE(color); | 79 | rgb->blue = _RGB_UNPACK_BLUE(color); |
80 | rgb->r = (color & 0xf800) >> 11; | ||
81 | rgb->g = (color & 0x07e0) >> 5; | ||
82 | rgb->b = (color & 0x001f); | ||
83 | } | 83 | } |
84 | 84 | ||
85 | /* Packs the native rgb colors into a color value */ | 85 | /* Packs the native rgb colors into a color value */ |
@@ -89,7 +89,7 @@ static void pack_rgb(struct rgb_pick *rgb) | |||
89 | (rgb->g & 0x3f) << 5 | | 89 | (rgb->g & 0x3f) << 5 | |
90 | (rgb->b & 0x1f); | 90 | (rgb->b & 0x1f); |
91 | #if LCD_PIXELFORMAT == RGB565SWAPPED | 91 | #if LCD_PIXELFORMAT == RGB565SWAPPED |
92 | swap16(color); | 92 | color = swap16(color); |
93 | #endif | 93 | #endif |
94 | rgb->color = color; | 94 | rgb->color = color; |
95 | } | 95 | } |
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index f0f143f442..41057535fb 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c | |||
@@ -42,6 +42,10 @@ | |||
42 | #pragma pack (push, 2) | 42 | #pragma pack (push, 2) |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | //#undef LCD_RGBPACK | ||
46 | //#define LCD_RGBPACK(r, g, b) swap16(_RGBPACK((r), (g), (b))) | ||
47 | |||
48 | |||
45 | /* Struct from original code. */ | 49 | /* Struct from original code. */ |
46 | struct Fileheader { | 50 | struct Fileheader { |
47 | unsigned short Type; /* signature - 'BM' */ | 51 | unsigned short Type; /* signature - 'BM' */ |
@@ -128,7 +132,7 @@ static unsigned short dither_24_to_16(struct rgb_quad rgb, int row, int col) | |||
128 | color = (unsigned short)(b | (g << 5) | (r << 11)); | 132 | color = (unsigned short)(b | (g << 5) | (r << 11)); |
129 | 133 | ||
130 | #if LCD_PIXELFORMAT == RGB565SWAPPED | 134 | #if LCD_PIXELFORMAT == RGB565SWAPPED |
131 | swap16(color); | 135 | color = swap16(color); |
132 | #endif | 136 | #endif |
133 | return color; | 137 | return color; |
134 | } | 138 | } |