eunue pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95d83e80406ddf48305cdbc91eecd340ecc4c6e1
commit 95d83e80406ddf48305cdbc91eecd340ecc4c6e1
Author: Jaeun Choi <jaeun12.c...@samsung.com>
Date: Fri Feb 10 16:56:50 2017 +0900
evas: fix bugs in gif image loader
gif's logical screen size (which is considered the image size)
might be different from the size of each frame.
when decoding a frame, the width and height of the decoded data should be
based on the size of the frame, not on the size of the logical screen size.
if a frame is decoded into a buffer of screen size, this might happen
(frame = 6 X 3, logical screen = 5 X 3)
OOOXXX OOOXX
OOOXXX => XOOOX
OOOXXX XXOOO
@fix
---
.../evas/image_loaders/gif/evas_image_load_gif.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
index f20b8cc..5646449 100644
--- a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
@@ -209,7 +209,8 @@ _new_frame(Evas_Image_Animated *animated,
// data pointer
static Eina_Bool
_decode_image(GifFileType *gif, DATA32 *data, int rowpix, int xin, int yin,
- int transparent, int x, int y, int w, int h, Eina_Bool fill)
+ int transparent, int fw, int fh,
+ int x, int y, int w, int h, Eina_Bool fill)
{
int intoffset[] = { 0, 4, 2, 1 };
int intjump[] = { 8, 8, 4, 2 };
@@ -224,14 +225,14 @@ _decode_image(GifFileType *gif, DATA32 *data, int rowpix,
int xin, int yin,
// build a blob of memory to have pointers to rows of pixels
// AND store the decoded gif pixels (1 byte per pixel) as welll
- rows = malloc((h * sizeof(GifRowType)) + (w * h * sizeof(GifPixelType)));
+ rows = malloc((fh * sizeof(GifRowType)) + (fw * fh * sizeof(GifPixelType)));
if (!rows) goto on_error;
// fill in the pointers at the start
- for (yy = 0; yy < h; yy++)
+ for (yy = 0; yy < fh; yy++)
{
- rows[yy] = ((unsigned char *)rows) + (h * sizeof(GifRowType)) +
- (yy * w * sizeof(GifPixelType));
+ rows[yy] = ((unsigned char *)rows) + (fh * sizeof(GifRowType)) +
+ (yy * fw * sizeof(GifPixelType));
}
// if give is interlaced, walk interlace pattern and decode into rows
@@ -239,9 +240,9 @@ _decode_image(GifFileType *gif, DATA32 *data, int rowpix,
int xin, int yin,
{
for (i = 0; i < 4; i++)
{
- for (yy = intoffset[i]; yy < h; yy += intjump[i])
+ for (yy = intoffset[i]; yy < fh; yy += intjump[i])
{
- if (DGifGetLine(gif, rows[yy], w) != GIF_OK)
+ if (DGifGetLine(gif, rows[yy], fw) != GIF_OK)
goto on_error;
}
}
@@ -249,9 +250,9 @@ _decode_image(GifFileType *gif, DATA32 *data, int rowpix,
int xin, int yin,
// normal top to bottom - decode into rows
else
{
- for (yy = 0; yy < h; yy++)
+ for (yy = 0; yy < fh; yy++)
{
- if (DGifGetLine(gif, rows[yy], w) != GIF_OK)
+ if (DGifGetLine(gif, rows[yy], fw) != GIF_OK)
goto on_error;
}
}
@@ -745,6 +746,7 @@ open_file:
&x, &y, &w, &h);
if (!_decode_image(gif, thisframe->data, prop->w,
xin, yin, finfo->transparent,
+ finfo->w, finfo->h,
x, y, w, h, first))
LOADERR(EVAS_LOAD_ERROR_CORRUPT_FILE);
// mark as loaded and done
@@ -772,6 +774,7 @@ open_file:
// and decode the gif with overwriting
if (!_decode_image(gif, pixels, prop->w,
xin, yin, finfo->transparent,
+ finfo->w, finfo->h,
x, y, w, h, EINA_TRUE))
LOADERR(EVAS_LOAD_ERROR_CORRUPT_FILE);
// mark as loaded and done
--
