diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-09-26 11:59:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 17:22:09 +0200 |
| commit | 21a8ef55b0a2140a7ef7bd38869ff63592335861 (patch) | |
| tree | bba74975da065345a5e0318189a41bbabb4d5cee /lib/gui | |
| parent | da0d61770a1eaebf90f92d432cde7f6e602da7da (diff) | |
| download | barebox-21a8ef55b0a2140a7ef7bd38869ff63592335861.tar.gz barebox-21a8ef55b0a2140a7ef7bd38869ff63592335861.tar.xz | |
graphic_utils: pass image so we can draw only the visible part of the image
This is needed if the image is bigger than the screen.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib/gui')
| -rw-r--r-- | lib/gui/graphic_utils.c | 7 | ||||
| -rw-r--r-- | lib/gui/png.c | 2 |
2 files changed, 5 insertions, 4 deletions
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; |