From aad1b1ed4ef186d34524600e9c33add8baf5725c Mon Sep 17 00:00:00 2001
From: Jiyoun Park <jijibe99@gmail.com>
Date: Thu, 10 Jan 2013 08:53:11 +0000
Subject: [PATCH]  Fix evas bmp loader code which deal with image size. if
 image file's image size not apply padding size, decoding cannot work
 correctly

SVN revision: 82532
---
 ChangeLog                                          | 4 ++++
 NEWS                                               | 1 +
 src/modules/evas/loaders/bmp/evas_image_load_bmp.c | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c6bfdbfc7a..aa8e120722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-09  Jiyoun Park (jypark)
+
+	* Fix evas bmp loader code which deal with image size.
+
 2013-01-08  Gustavo Sverzut Barbieri (k-s)
 
 	* Fix eina_prefix_new() with debian multilib without magic check file.
diff --git a/NEWS b/NEWS
index 5ca20a6531..ba2db5d713 100644
--- a/NEWS
+++ b/NEWS
@@ -105,3 +105,4 @@ Fixes:
     * Fix build of Evas XCB backend
     * Fix efreet desktop command parsing of https
     * Fix eina_prefix_new() with debian multilib without magic check file.
+    * Fix evas bmp loader code which deal with image size.
diff --git a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
index 4d844f55f3..21a9af03b3 100644
--- a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
+++ b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
@@ -625,6 +625,8 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
      }
 
    row_size = ceil((double)(image_w * bit_count) / 32) * 4;
+   if (image_size != row_size * h)
+     image_size = row_size * h;
 
    if (bit_count < 16)
      {