summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoun Park <jijibe99@gmail.com>2013-01-10 08:53:11 +0000
committerJiyoun Park <jijibe99@gmail.com>2013-01-10 08:53:11 +0000
commitaad1b1ed4ef186d34524600e9c33add8baf5725c (patch)
tree1d16bc97f4cc6ad16b93e219fc28340014b5f82a
parent09e6baa5a422e988dbcd7af1466d91e5b825f47b (diff)
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
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/modules/evas/loaders/bmp/evas_image_load_bmp.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c6bfdbfc7a..aa8e120722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-01-09 Jiyoun Park (jypark)
2
3 * Fix evas bmp loader code which deal with image size.
4
12013-01-08 Gustavo Sverzut Barbieri (k-s) 52013-01-08 Gustavo Sverzut Barbieri (k-s)
2 6
3 * Fix eina_prefix_new() with debian multilib without magic check file. 7 * 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:
105 * Fix build of Evas XCB backend 105 * Fix build of Evas XCB backend
106 * Fix efreet desktop command parsing of https 106 * Fix efreet desktop command parsing of https
107 * Fix eina_prefix_new() with debian multilib without magic check file. 107 * Fix eina_prefix_new() with debian multilib without magic check file.
108 * 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
625 } 625 }
626 626
627 row_size = ceil((double)(image_w * bit_count) / 32) * 4; 627 row_size = ceil((double)(image_w * bit_count) / 32) * 4;
628 if (image_size != row_size * h)
629 image_size = row_size * h;
628 630
629 if (bit_count < 16) 631 if (bit_count < 16)
630 { 632 {