From: jiin.moon <jiin.moon@samsung.com>
Date: Fri, 19 Aug 2016 05:16:39 +0000 (+0900)
Subject: evas: Fix an issue with 4bit RLE image
X-Git-Tag: accepted/tizen/common/20160921.162828~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1634e09304d492beacef0367f7aa169670311d75;p=platform%2Fupstream%2Fefl.git

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 <jiin.moon@samsung.com>
---

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;