diff options
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r-- | apps/plugins/lib/grey_draw.c | 13 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_bmp.c | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c index 65f2211b7f..6315ad9b1a 100644 --- a/apps/plugins/lib/grey_draw.c +++ b/apps/plugins/lib/grey_draw.c | |||
@@ -719,7 +719,15 @@ void grey_ub_gray_bitmap(const unsigned char *src, int x, int y, int width, | |||
719 | grey_ub_gray_bitmap_part(src, 0, 0, width, x, y, width, height); | 719 | grey_ub_gray_bitmap_part(src, 0, 0, width, x, y, width, height); |
720 | } | 720 | } |
721 | 721 | ||
722 | static void output_row_grey(uint32_t row, void * row_in, struct scaler_context *ctx) | 722 | static void output_row_grey_8(uint32_t row, void * row_in, |
723 | struct scaler_context *ctx) | ||
724 | { | ||
725 | uint8_t *dest = (uint8_t*)ctx->bm->data + ctx->bm->width * row; | ||
726 | rb->memcpy(dest, row_in, ctx->bm->width); | ||
727 | } | ||
728 | |||
729 | static void output_row_grey_32(uint32_t row, void * row_in, | ||
730 | struct scaler_context *ctx) | ||
723 | { | 731 | { |
724 | int col; | 732 | int col; |
725 | uint32_t *qp = (uint32_t*)row_in; | 733 | uint32_t *qp = (uint32_t*)row_in; |
@@ -734,6 +742,7 @@ static unsigned int get_size_grey(struct bitmap *bm) | |||
734 | } | 742 | } |
735 | 743 | ||
736 | const struct custom_format format_grey = { | 744 | const struct custom_format format_grey = { |
737 | .output_row = output_row_grey, | 745 | .output_row_8 = output_row_grey_8, |
746 | .output_row_32 = output_row_grey_32, | ||
738 | .get_size = get_size_grey | 747 | .get_size = get_size_grey |
739 | }; | 748 | }; |
diff --git a/apps/plugins/lib/pluginlib_bmp.c b/apps/plugins/lib/pluginlib_bmp.c index 110e534be0..6b1a54291c 100644 --- a/apps/plugins/lib/pluginlib_bmp.c +++ b/apps/plugins/lib/pluginlib_bmp.c | |||
@@ -124,14 +124,7 @@ void simple_resize_bitmap(struct bitmap *src, struct bitmap *dst) | |||
124 | 124 | ||
125 | #endif /* LCD_DEPTH > 1 */ | 125 | #endif /* LCD_DEPTH > 1 */ |
126 | 126 | ||
127 | #ifndef HAVE_BMP_SCALING | ||
128 | #include "wrappers.h" | 127 | #include "wrappers.h" |
129 | 128 | ||
130 | /* import the core bmp loader */ | 129 | /* import the core bmp loader */ |
131 | #include "recorder/bmp.c" | 130 | #include "recorder/bmp.c" |
132 | #else | ||
133 | /* the full 16x16 Bayer dither matrix may be calculated quickly with this table | ||
134 | */ | ||
135 | const unsigned char dither_table[16] = | ||
136 | { 0,192, 48,240, 12,204, 60,252, 3,195, 51,243, 15,207, 63,255 }; | ||
137 | #endif | ||