diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-09-30 10:25:28 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-09-30 10:42:49 +0100 |
commit | f373c97c90e816404c00ab48b2e36b18fd5e6c49 (patch) | |
tree | b268985996c496f9149e4508f9fea950711e1a6c /apps/plugins/imageviewer | |
parent | 9ed36ec22f7ea880b64fa11d2c0d49485287ad03 (diff) | |
download | rockbox-f373c97c90e816404c00ab48b2e36b18fd5e6c49.tar.gz rockbox-f373c97c90e816404c00ab48b2e36b18fd5e6c49.zip |
Define LCD_STRIDEFORMAT unconditionally
Instead of putting "#ifdef LCD_STRIDEFORMAT" at every usage of the
macro it's simpler to have config.h define LCD_STRIDEFORMAT to the
default of horizontal stride when the target leaves it unspecified.
Change-Id: Ib187012aad65ac678dbd837b1464a83bad722411
Diffstat (limited to 'apps/plugins/imageviewer')
-rw-r--r-- | apps/plugins/imageviewer/jpeg/yuv2rgb.c | 2 | ||||
-rw-r--r-- | apps/plugins/imageviewer/ppm/ppm_decoder.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/imageviewer/jpeg/yuv2rgb.c b/apps/plugins/imageviewer/jpeg/yuv2rgb.c index 61d7fd6487..3e7f08d8bc 100644 --- a/apps/plugins/imageviewer/jpeg/yuv2rgb.c +++ b/apps/plugins/imageviewer/jpeg/yuv2rgb.c | |||
@@ -238,7 +238,7 @@ static fb_data (* const pixel_funcs[COLOUR_NUM_MODES][DITHER_NUM_MODES])(void) = | |||
238 | }; | 238 | }; |
239 | 239 | ||
240 | /* These defines are used fornormal horizontal strides and vertical strides. */ | 240 | /* These defines are used fornormal horizontal strides and vertical strides. */ |
241 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 241 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
242 | #define LCDADDR(x, y) (lcd_fb + LCD_HEIGHT*(x) + (y)) | 242 | #define LCDADDR(x, y) (lcd_fb + LCD_HEIGHT*(x) + (y)) |
243 | #define ROWENDOFFSET (width*LCD_HEIGHT) | 243 | #define ROWENDOFFSET (width*LCD_HEIGHT) |
244 | #define ROWOFFSET (1) | 244 | #define ROWOFFSET (1) |
diff --git a/apps/plugins/imageviewer/ppm/ppm_decoder.c b/apps/plugins/imageviewer/ppm/ppm_decoder.c index 4a86be1a3a..ccb208b80b 100644 --- a/apps/plugins/imageviewer/ppm/ppm_decoder.c +++ b/apps/plugins/imageviewer/ppm/ppm_decoder.c | |||
@@ -177,7 +177,7 @@ static int read_ppm_row(int fd, struct ppm_info *ppm, int row) | |||
177 | int col; | 177 | int col; |
178 | int r, g, b; | 178 | int r, g, b; |
179 | #ifdef HAVE_LCD_COLOR | 179 | #ifdef HAVE_LCD_COLOR |
180 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 180 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
181 | fb_data *dst = (fb_data *) ppm->buf + row; | 181 | fb_data *dst = (fb_data *) ppm->buf + row; |
182 | const int stride = ppm->x; | 182 | const int stride = ppm->x; |
183 | #else | 183 | #else |