From 1634e09304d492beacef0367f7aa169670311d75 Mon Sep 17 00:00:00 2001 From: "jiin.moon" Date: Fri, 19 Aug 2016 14:16:39 +0900 Subject: [PATCH] evas: Fix an issue with 4bit RLE image Without this patch, BMP loader can't region decode with 4bit RLE image Change-Id: Ib16f5c6aba4a8d537b1fc7bde744df426f3daf47 Signed-off-by: jiin.moon --- src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c index 93f4d59..49fb4e8 100644 --- a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c +++ b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c @@ -806,7 +806,7 @@ evas_image_load_file_data_bmp(void *loader_data, count = p[0] / 2; while (count > 0) { - if (x < header.width) + if (x < image_w) { if ((x >= region_x) && ((x % scale_ratio) == 0) && (scale_x < header.width)) { @@ -816,7 +816,7 @@ evas_image_load_file_data_bmp(void *loader_data, } x++; } - if (x < header.width) + if (x < image_w) { if ((x >= region_x) && ((x % scale_ratio) == 0) && (scale_x < header.width)) { @@ -888,7 +888,7 @@ evas_image_load_file_data_bmp(void *loader_data, default: count = p[1]; if (((p + count) > buffer_end) || - ((x + count) > header.width)) + ((x + count) > image_w)) { p = buffer_end; break; -- 2.7.4