diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-09 10:32:07 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-09 10:32:07 +0000 |
commit | 59e70b50d8532568b5df09b01b9f0df042766267 (patch) | |
tree | 1c032550bd4b597c9dcc3035ace070fcc965a341 /apps | |
parent | e3b1d78dfc06ec69248558630d3a4afd7c1ec9c2 (diff) | |
download | rockbox-59e70b50d8532568b5df09b01b9f0df042766267.tar.gz rockbox-59e70b50d8532568b5df09b01b9f0df042766267.zip |
Inline output_row_8_native when building bmp.c in core without HAVE_JPEG or HAVE_BMP_SCALING.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20886 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/recorder/bmp.c | 9 | ||||
-rw-r--r-- | apps/recorder/bmp.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index 4897b2db18..eef425fb25 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c | |||
@@ -352,6 +352,9 @@ static inline int rgbcmp(struct uint8_rgb rgb1, struct uint8_rgb rgb2) | |||
352 | return 1; | 352 | return 1; |
353 | } | 353 | } |
354 | #if LCD_DEPTH > 1 | 354 | #if LCD_DEPTH > 1 |
355 | #if !defined(PLUGIN) && !defined(HAVE_JPEG) && !defined(HAVE_BMP_SCALING) | ||
356 | static inline | ||
357 | #endif | ||
355 | void output_row_8_native(uint32_t row, void * row_in, | 358 | void output_row_8_native(uint32_t row, void * row_in, |
356 | struct scaler_context *ctx) | 359 | struct scaler_context *ctx) |
357 | { | 360 | { |
@@ -703,6 +706,7 @@ int read_bmp_fd(int fd, | |||
703 | .dither = dither, | 706 | .dither = dither, |
704 | }; | 707 | }; |
705 | #endif | 708 | #endif |
709 | #if defined(PLUGIN) || defined(HAVE_JPEG) || defined(HAVE_BMP_SCALING) | ||
706 | #if LCD_DEPTH > 1 | 710 | #if LCD_DEPTH > 1 |
707 | void (*output_row_8)(uint32_t, void*, struct scaler_context*) = | 711 | void (*output_row_8)(uint32_t, void*, struct scaler_context*) = |
708 | output_row_8_native; | 712 | output_row_8_native; |
@@ -713,6 +717,7 @@ int read_bmp_fd(int fd, | |||
713 | if (cformat) | 717 | if (cformat) |
714 | output_row_8 = cformat->output_row_8; | 718 | output_row_8 = cformat->output_row_8; |
715 | #endif | 719 | #endif |
720 | #endif | ||
716 | 721 | ||
717 | int row; | 722 | int row; |
718 | /* loop to read rows and put them to buffer */ | 723 | /* loop to read rows and put them to buffer */ |
@@ -762,7 +767,11 @@ int read_bmp_fd(int fd, | |||
762 | (LCD_REMOTE_DEPTH > 1) */ | 767 | (LCD_REMOTE_DEPTH > 1) */ |
763 | #if LCD_DEPTH > 1 || defined(PLUGIN) | 768 | #if LCD_DEPTH > 1 || defined(PLUGIN) |
764 | { | 769 | { |
770 | #if !defined(PLUGIN) && !defined(HAVE_JPEG) && !defined(HAVE_BMP_SCALING) | ||
771 | output_row_8_native(row, ba.buf, &ctx); | ||
772 | #else | ||
765 | output_row_8(row, ba.buf, &ctx); | 773 | output_row_8(row, ba.buf, &ctx); |
774 | #endif | ||
766 | } | 775 | } |
767 | #endif | 776 | #endif |
768 | #if ((LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) && \ | 777 | #if ((LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) && \ |
diff --git a/apps/recorder/bmp.h b/apps/recorder/bmp.h index 6437e42d26..c6a34dfd94 100644 --- a/apps/recorder/bmp.h +++ b/apps/recorder/bmp.h | |||
@@ -212,7 +212,7 @@ int read_bmp_fd(int fd, | |||
212 | int format, | 212 | int format, |
213 | const struct custom_format *cformat); | 213 | const struct custom_format *cformat); |
214 | 214 | ||
215 | #if LCD_DEPTH > 1 | 215 | #if LCD_DEPTH > 1 && (defined(PLUGIN) || defined(HAVE_BMP_SCALING) || defined(HAVE_JPEG)) |
216 | void output_row_8_native(uint32_t row, void * row_in, | 216 | void output_row_8_native(uint32_t row, void * row_in, |
217 | struct scaler_context *ctx); | 217 | struct scaler_context *ctx); |
218 | #endif | 218 | #endif |