diff options
-rw-r--r-- | include/gui/graphic_utils.h | 5 | ||||
-rw-r--r-- | lib/gui/graphic_utils.c | 7 | ||||
-rw-r--r-- | lib/gui/png.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/gui/graphic_utils.h b/include/gui/graphic_utils.h index 9909b6c873..4690e51e62 100644 --- a/include/gui/graphic_utils.h +++ b/include/gui/graphic_utils.h @@ -7,7 +7,10 @@ #ifndef __GRAPHIC_UTILS_H__ #define __GRAPHIC_UTILS_H__ -void rgba_blend(struct fb_info *info, void *image, void* dest, int height, +#include <fb.h> +#include <gui/image.h> + +void rgba_blend(struct fb_info *info, struct image *img, void* dest, int height, int width, int startx, int starty, bool is_rgba); void set_pixel(struct fb_info *info, void *adr, u32 px); void set_rgb_pixel(struct fb_info *info, void *adr, u8 r, u8 g, u8 b); diff --git a/lib/gui/graphic_utils.c b/lib/gui/graphic_utils.c index bf42103b4b..06f811c6cd 100644 --- a/lib/gui/graphic_utils.c +++ b/lib/gui/graphic_utils.c @@ -157,13 +157,14 @@ void set_rgba_pixel(struct fb_info *info, void *adr, u8 r, u8 g, u8 b, u8 a) set_pixel(info, adr, px); } -void rgba_blend(struct fb_info *info, void *image, void* buf, int height, +void rgba_blend(struct fb_info *info, struct image *img, void* buf, int height, int width, int startx, int starty, bool is_rgba) { unsigned char *adr; int x, y; int xres; int img_byte_per_pixel = 3; + void *image; if (is_rgba) img_byte_per_pixel++; @@ -173,11 +174,11 @@ void rgba_blend(struct fb_info *info, void *image, void* buf, int height, for (y = 0; y < height; y++) { adr = buf + ((y + starty) * xres + startx) * (info->bits_per_pixel >> 3); + image = img->data + (y * img->width *img_byte_per_pixel); for (x = 0; x < width; x++) { - char *pixel; + uint8_t *pixel = image; - pixel = image; if (is_rgba) set_rgba_pixel(info, adr, pixel[0], pixel[1], pixel[2], pixel[3]); diff --git a/lib/gui/png.c b/lib/gui/png.c index 5d77c8ce56..1e9efd529d 100644 --- a/lib/gui/png.c +++ b/lib/gui/png.c @@ -63,7 +63,7 @@ static int png_renderer(struct fb_info *info, struct image *img, void* fb, buf = offscreenbuf ? offscreenbuf : fb; - rgba_blend(info, img->data, buf, height, width, startx, starty, true); + rgba_blend(info, img, buf, height, width, startx, starty, true); if (offscreenbuf) { int fbsize; |