aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/evas/src/modules/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/evas/src/modules/loaders')
-rw-r--r--libraries/evas/src/modules/loaders/Makefile.in10
-rw-r--r--libraries/evas/src/modules/loaders/bmp/Makefile.am7
-rw-r--r--libraries/evas/src/modules/loaders/bmp/Makefile.in13
-rw-r--r--libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c108
-rw-r--r--libraries/evas/src/modules/loaders/edb/Makefile.in8
-rw-r--r--libraries/evas/src/modules/loaders/eet/Makefile.am2
-rw-r--r--libraries/evas/src/modules/loaders/eet/Makefile.in9
-rw-r--r--libraries/evas/src/modules/loaders/generic/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/generic/Makefile.in12
-rw-r--r--libraries/evas/src/modules/loaders/gif/Makefile.am2
-rw-r--r--libraries/evas/src/modules/loaders/gif/Makefile.in9
-rw-r--r--libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c15
-rw-r--r--libraries/evas/src/modules/loaders/ico/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/ico/Makefile.in11
-rw-r--r--libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c28
-rw-r--r--libraries/evas/src/modules/loaders/jpeg/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/jpeg/Makefile.in12
-rw-r--r--libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c85
-rw-r--r--libraries/evas/src/modules/loaders/pmaps/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/pmaps/Makefile.in12
-rw-r--r--libraries/evas/src/modules/loaders/png/Makefile.am3
-rw-r--r--libraries/evas/src/modules/loaders/png/Makefile.in11
-rw-r--r--libraries/evas/src/modules/loaders/psd/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/psd/Makefile.in11
-rw-r--r--libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c16
-rw-r--r--libraries/evas/src/modules/loaders/svg/Makefile.am2
-rw-r--r--libraries/evas/src/modules/loaders/svg/Makefile.in9
-rw-r--r--libraries/evas/src/modules/loaders/tga/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/tga/Makefile.in11
-rw-r--r--libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c10
-rw-r--r--libraries/evas/src/modules/loaders/tiff/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/tiff/Makefile.in12
-rw-r--r--libraries/evas/src/modules/loaders/wbmp/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/wbmp/Makefile.in11
-rw-r--r--libraries/evas/src/modules/loaders/xpm/Makefile.am5
-rw-r--r--libraries/evas/src/modules/loaders/xpm/Makefile.in12
-rw-r--r--libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c3
37 files changed, 225 insertions, 274 deletions
diff --git a/libraries/evas/src/modules/loaders/Makefile.in b/libraries/evas/src/modules/loaders/Makefile.in
index 454dcd8..f37032a 100644
--- a/libraries/evas/src/modules/loaders/Makefile.in
+++ b/libraries/evas/src/modules/loaders/Makefile.in
@@ -49,7 +49,7 @@ host_triplet = @host@
49@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@am__append_14 = wbmp 49@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@am__append_14 = wbmp
50@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@am__append_15 = xpm 50@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@am__append_15 = xpm
51subdir = src/modules/loaders 51subdir = src/modules/loaders
52DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 52DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
53ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 53ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
54am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \ 54am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
55 $(top_srcdir)/m4/efl_coverage.m4 \ 55 $(top_srcdir)/m4/efl_coverage.m4 \
@@ -172,6 +172,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
172EVIL_CFLAGS = @EVIL_CFLAGS@ 172EVIL_CFLAGS = @EVIL_CFLAGS@
173EVIL_LIBS = @EVIL_LIBS@ 173EVIL_LIBS = @EVIL_LIBS@
174EXEEXT = @EXEEXT@ 174EXEEXT = @EXEEXT@
175EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
176EXOTIC_LIBS = @EXOTIC_LIBS@
175FGREP = @FGREP@ 177FGREP = @FGREP@
176FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 178FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
177FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 179FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -222,6 +224,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
222PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 224PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
223PIXMAN_LIBS = @PIXMAN_LIBS@ 225PIXMAN_LIBS = @PIXMAN_LIBS@
224PKG_CONFIG = @PKG_CONFIG@ 226PKG_CONFIG = @PKG_CONFIG@
227PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
228PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
225PNG_CFLAGS = @PNG_CFLAGS@ 229PNG_CFLAGS = @PNG_CFLAGS@
226PNG_LIBS = @PNG_LIBS@ 230PNG_LIBS = @PNG_LIBS@
227RANLIB = @RANLIB@ 231RANLIB = @RANLIB@
@@ -240,8 +244,6 @@ VERSION = @VERSION@
240VMAJ = @VMAJ@ 244VMAJ = @VMAJ@
241WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 245WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
242WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 246WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
243WIN32_CFLAGS = @WIN32_CFLAGS@
244WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
245XCB_CFLAGS = @XCB_CFLAGS@ 247XCB_CFLAGS = @XCB_CFLAGS@
246XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 248XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
247XCB_GL_LIBS = @XCB_GL_LIBS@ 249XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -315,8 +317,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
315evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 317evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
316evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 318evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
317evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 319evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
318evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
319evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
320evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 320evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
321evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 321evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
322evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 322evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
diff --git a/libraries/evas/src/modules/loaders/bmp/Makefile.am b/libraries/evas/src/modules/loaders/bmp/Makefile.am
index 857f3b9..0a04790 100644
--- a/libraries/evas/src/modules/loaders/bmp/Makefile.am
+++ b/libraries/evas/src/modules/loaders/bmp/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@
12@WIN32_CPPFLAGS@
13 12
14if BUILD_LOADER_BMP 13if BUILD_LOADER_BMP
15if !EVAS_STATIC_BUILD_BMP 14if !EVAS_STATIC_BUILD_BMP
@@ -19,7 +18,7 @@ pkg_LTLIBRARIES = module.la
19 18
20module_la_SOURCES = evas_image_load_bmp.c 19module_la_SOURCES = evas_image_load_bmp.c
21 20
22module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la 21module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la
23module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 22module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 23module_la_LIBTOOLFLAGS = --tag=disable-static
25 24
@@ -27,7 +26,7 @@ else
27 26
28noinst_LTLIBRARIES = libevas_loader_bmp.la 27noinst_LTLIBRARIES = libevas_loader_bmp.la
29libevas_loader_bmp_la_SOURCES = evas_image_load_bmp.c 28libevas_loader_bmp_la_SOURCES = evas_image_load_bmp.c
30libevas_loader_bmp_la_LIBADD = 29libevas_loader_bmp_la_LIBADD =
31 30
32endif 31endif
33endif 32endif
diff --git a/libraries/evas/src/modules/loaders/bmp/Makefile.in b/libraries/evas/src/modules/loaders/bmp/Makefile.in
index 943fb74..40600cc 100644
--- a/libraries/evas/src/modules/loaders/bmp/Makefile.in
+++ b/libraries/evas/src/modules/loaders/bmp/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,13 +416,12 @@ AM_CPPFLAGS = \
416@FREETYPE_CFLAGS@ \ 416@FREETYPE_CFLAGS@ \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@EVIL_CFLAGS@ \ 419@EVIL_CFLAGS@
420@WIN32_CPPFLAGS@
421 420
422@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) 421@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
423@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkg_LTLIBRARIES = module.la
424@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_SOURCES = evas_image_load_bmp.c 423@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_SOURCES = evas_image_load_bmp.c
425@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la 424@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la
426@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 425@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
427@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static 426@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
428@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_TRUE@noinst_LTLIBRARIES = libevas_loader_bmp.la 427@BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_TRUE@noinst_LTLIBRARIES = libevas_loader_bmp.la
diff --git a/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c b/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
index 6d15783..9453ceb 100644
--- a/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
+++ b/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
@@ -107,12 +107,8 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
107 void *map = NULL; 107 void *map = NULL;
108 size_t position = 0; 108 size_t position = 0;
109 char hasa = 0; 109 char hasa = 0;
110 int w = 0, h = 0, planes = 0, bit_count = 0, 110 int w = 0, h = 0, bit_count = 0, image_size = 0, comp = 0;
111 image_size = 0, comp = 0, hdpi = 0, vdpi = 0, 111 unsigned int offset, head_size, amask = 0;
112 palette_size = -1, important_colors = 0;
113 unsigned int offset, head_size, rmask = 0, gmask = 0, bmask = 0, amask = 0;
114 unsigned int pal_num = 0;
115 int right_way_up = 0;
116 int fsize = 0; 112 int fsize = 0;
117 unsigned int bmpsize; 113 unsigned int bmpsize;
118 unsigned short res1, res2; 114 unsigned short res1, res2;
@@ -148,7 +144,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
148 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 144 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
149 h = tmp; // height 145 h = tmp; // height
150 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 146 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
151 planes = tmp; // must be 1 147 //planes = tmp; // must be 1
152 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 148 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
153 bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 149 bit_count = tmp; // bits per pixel: 1, 4, 8 & 24
154 } 150 }
@@ -162,7 +158,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
162 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 158 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
163 h = tmp2; // height 159 h = tmp2; // height
164 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 160 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
165 planes = tmp; // must be 1 161 //planes = tmp; // must be 1
166 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 162 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
167 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 163 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
168 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 164 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -170,13 +166,13 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
170 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 166 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
171 image_size = tmp2; // bitmap data size 167 image_size = tmp2; // bitmap data size
172 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 168 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
173 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 169 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
174 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 170 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
175 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 171 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
176 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 172 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
177 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 173 //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
178 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 174 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
179 important_colors = tmp2; // number of important colors - 0 if all 175 //important_colors = tmp2; // number of important colors - 0 if all
180 if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header 176 if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header
181 if (image_size == 0) image_size = fsize - offset; 177 if (image_size == 0) image_size = fsize - offset;
182 } 178 }
@@ -190,7 +186,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
190 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 186 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
191 h = tmp2; // height 187 h = tmp2; // height
192 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 188 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
193 planes = tmp; // must be 1 189 //planes = tmp; // must be 1
194 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 190 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
195 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 191 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
196 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 192 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -198,13 +194,13 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
198 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 194 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
199 image_size = tmp2; // bitmap data size 195 image_size = tmp2; // bitmap data size
200 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 196 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
201 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 197 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
202 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 198 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
203 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 199 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
204 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 200 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
205 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 201 //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
206 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 202 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
207 important_colors = tmp2; // number of important colors - 0 if all 203 //important_colors = tmp2; // number of important colors - 0 if all
208 if (image_size == 0) image_size = fsize - offset; 204 if (image_size == 0) image_size = fsize - offset;
209 if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way 205 if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way
210 } 206 }
@@ -218,7 +214,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
218 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 214 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
219 h = tmp2; // height 215 h = tmp2; // height
220 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 216 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
221 planes = tmp; // must be 1 217 //planes = tmp; // must be 1
222 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 218 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
223 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 219 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
224 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 220 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -226,19 +222,19 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
226 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 222 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
227 image_size = tmp2; // bitmap data size 223 image_size = tmp2; // bitmap data size
228 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 224 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
229 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 225 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
230 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 226 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
231 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 227 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
232 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 228 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
233 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 229 //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
234 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 230 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
235 important_colors = tmp2; // number of important colors - 0 if all 231 //important_colors = tmp2; // number of important colors - 0 if all
236 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 232 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
237 rmask = tmp2; // red mask 233 //rmask = tmp2; // red mask
238 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 234 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
239 gmask = tmp2; // green mask 235 //gmask = tmp2; // green mask
240 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 236 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
241 bmask = tmp2; // blue mask 237 //bmask = tmp2; // blue mask
242 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 238 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
243 amask = tmp2; // alpha mask 239 amask = tmp2; // alpha mask
244 if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie 240 if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie
@@ -256,27 +252,27 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
256 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 252 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
257 h = tmp2; // height 253 h = tmp2; // height
258 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 254 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
259 planes = tmp; // must be 1 255 //planes = tmp; // must be 1
260 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 256 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
261 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 257 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
262 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 258 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
263 comp = tmp2; // compression method 259 comp = tmp2; // compression method
264 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 260 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
265 image_size = tmp2; // bitmap data size 261 //image_size = tmp2; // bitmap data size
266 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 262 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
267 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 263 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
268 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 264 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
269 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 265 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
270 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 266 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
271 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 267 //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
272 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 268 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
273 important_colors = tmp2; // number of important colors - 0 if all 269 //important_colors = tmp2; // number of important colors - 0 if all
274 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 270 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
275 rmask = tmp2; // red mask 271 //rmask = tmp2; // red mask
276 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 272 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
277 gmask = tmp2; // green mask 273 //gmask = tmp2; // green mask
278 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 274 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
279 bmask = tmp2; // blue mask 275 //bmask = tmp2; // blue mask
280 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 276 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
281 amask = tmp2; // alpha mask 277 amask = tmp2; // alpha mask
282 if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie 278 if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie
@@ -291,7 +287,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
291 if (h < 0) 287 if (h < 0)
292 { 288 {
293 h = -h; 289 h = -h;
294 right_way_up = 1; 290 //right_way_up = 1;
295 } 291 }
296 292
297 if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) || 293 if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
@@ -313,8 +309,8 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
313 309
314 if (bit_count < 16) 310 if (bit_count < 16)
315 { 311 {
316 if ((palette_size < 0) || (palette_size > 256)) pal_num = 256; 312 //if ((palette_size < 0) || (palette_size > 256)) pal_num = 256;
317 else pal_num = palette_size; 313 //else pal_num = palette_size;
318 if (bit_count == 1) 314 if (bit_count == 1)
319 { 315 {
320 if (comp == 0) // no compression 316 if (comp == 0) // no compression
@@ -389,8 +385,8 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
389 size_t position = 0; 385 size_t position = 0;
390 unsigned char *buffer = NULL, *buffer_end = NULL, *p; 386 unsigned char *buffer = NULL, *buffer_end = NULL, *p;
391 char hasa = 0; 387 char hasa = 0;
392 int x = 0, y = 0, w = 0, h = 0, planes = 0, bit_count = 0, image_size = 0, 388 int x = 0, y = 0, w = 0, h = 0, bit_count = 0, image_size = 0,
393 comp = 0, hdpi = 0, vdpi = 0, palette_size = -1, important_colors = 0; 389 comp = 0, palette_size = -1;
394 unsigned int offset = 0, head_size = 0; 390 unsigned int offset = 0, head_size = 0;
395 unsigned int *pal = NULL, pal_num = 0, *pix = NULL, *surface = NULL, fix, 391 unsigned int *pal = NULL, pal_num = 0, *pix = NULL, *surface = NULL, fix,
396 rmask = 0, gmask = 0, bmask = 0, amask = 0; 392 rmask = 0, gmask = 0, bmask = 0, amask = 0;
@@ -440,7 +436,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
440 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 436 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
441 h = tmp; // height 437 h = tmp; // height
442 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 438 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
443 planes = tmp; // must be 1 439 //planes = tmp; // must be 1
444 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 440 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
445 bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 441 bit_count = tmp; // bits per pixel: 1, 4, 8 & 24
446 } 442 }
@@ -454,7 +450,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
454 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 450 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
455 h = tmp2; // height 451 h = tmp2; // height
456 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 452 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
457 planes = tmp; // must be 1 453 //planes = tmp; // must be 1
458 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 454 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
459 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 455 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
460 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 456 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -462,13 +458,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
462 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 458 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
463 image_size = tmp2; // bitmap data size 459 image_size = tmp2; // bitmap data size
464 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 460 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
465 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 461 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
466 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 462 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
467 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 463 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
468 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 464 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
469 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 465 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
470 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 466 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
471 important_colors = tmp2; // number of important colors - 0 if all 467 //important_colors = tmp2; // number of important colors - 0 if all
472 if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header 468 if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header
473 if (image_size == 0) image_size = fsize - offset; 469 if (image_size == 0) image_size = fsize - offset;
474 } 470 }
@@ -482,7 +478,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
482 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 478 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
483 h = tmp2; // height 479 h = tmp2; // height
484 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 480 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
485 planes = tmp; // must be 1 481 //planes = tmp; // must be 1
486 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 482 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
487 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 483 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
488 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 484 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -490,13 +486,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
490 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 486 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
491 image_size = tmp2; // bitmap data size 487 image_size = tmp2; // bitmap data size
492 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 488 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
493 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 489 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
494 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 490 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
495 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 491 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
496 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 492 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
497 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 493 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
498 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 494 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
499 important_colors = tmp2; // number of important colors - 0 if all 495 //important_colors = tmp2; // number of important colors - 0 if all
500 if (image_size == 0) image_size = fsize - offset; 496 if (image_size == 0) image_size = fsize - offset;
501 if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way 497 if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way
502 } 498 }
@@ -510,7 +506,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
510 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 506 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
511 h = tmp2; // height 507 h = tmp2; // height
512 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 508 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
513 planes = tmp; // must be 1 509 //planes = tmp; // must be 1
514 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 510 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
515 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 511 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
516 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 512 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -518,13 +514,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
518 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 514 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
519 image_size = tmp2; // bitmap data size 515 image_size = tmp2; // bitmap data size
520 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 516 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
521 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 517 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
522 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 518 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
523 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 519 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
524 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 520 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
525 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 521 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
526 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 522 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
527 important_colors = tmp2; // number of important colors - 0 if all 523 //important_colors = tmp2; // number of important colors - 0 if all
528 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 524 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
529 rmask = tmp2; // red mask 525 rmask = tmp2; // red mask
530 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 526 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -548,7 +544,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
548 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 544 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
549 h = tmp2; // height 545 h = tmp2; // height
550 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 546 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
551 planes = tmp; // must be 1 547 //planes = tmp; // must be 1
552 if (!read_short(map, fsize, &position, &tmp)) goto close_file; 548 if (!read_short(map, fsize, &position, &tmp)) goto close_file;
553 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 549 bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32
554 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 550 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
@@ -556,13 +552,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
556 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 552 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
557 image_size = tmp2; // bitmap data size 553 image_size = tmp2; // bitmap data size
558 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 554 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
559 hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter 555 //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter
560 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 556 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
561 vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter 557 //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter
562 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 558 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
563 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) 559 palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8)
564 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 560 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
565 important_colors = tmp2; // number of important colors - 0 if all 561 //important_colors = tmp2; // number of important colors - 0 if all
566 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 562 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
567 rmask = tmp2; // red mask 563 rmask = tmp2; // red mask
568 if (!read_int(map, fsize, &position, &tmp2)) goto close_file; 564 if (!read_int(map, fsize, &position, &tmp2)) goto close_file;
diff --git a/libraries/evas/src/modules/loaders/edb/Makefile.in b/libraries/evas/src/modules/loaders/edb/Makefile.in
index 87356b4..19f906f 100644
--- a/libraries/evas/src/modules/loaders/edb/Makefile.in
+++ b/libraries/evas/src/modules/loaders/edb/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
diff --git a/libraries/evas/src/modules/loaders/eet/Makefile.am b/libraries/evas/src/modules/loaders/eet/Makefile.am
index c96a8d3..44270e5 100644
--- a/libraries/evas/src/modules/loaders/eet/Makefile.am
+++ b/libraries/evas/src/modules/loaders/eet/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
10@evas_image_loader_eet_cflags@ \ 10@evas_image_loader_eet_cflags@ \
11@EINA_CFLAGS@ 11@EINA_CFLAGS@
12 12
13AM_CFLAGS = @WIN32_CFLAGS@
14
15 13
16if BUILD_LOADER_EET 14if BUILD_LOADER_EET
17if !EVAS_STATIC_BUILD_EET 15if !EVAS_STATIC_BUILD_EET
diff --git a/libraries/evas/src/modules/loaders/eet/Makefile.in b/libraries/evas/src/modules/loaders/eet/Makefile.in
index 25a30cf..b144d3a 100644
--- a/libraries/evas/src/modules/loaders/eet/Makefile.in
+++ b/libraries/evas/src/modules/loaders/eet/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \
418@evas_image_loader_eet_cflags@ \ 418@evas_image_loader_eet_cflags@ \
419@EINA_CFLAGS@ 419@EINA_CFLAGS@
420 420
421AM_CFLAGS = @WIN32_CFLAGS@
422@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) 421@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
423@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la
424@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_load_eet.c 423@BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_load_eet.c
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.am b/libraries/evas/src/modules/loaders/generic/Makefile.am
index a9e522e..1f72bfc 100644
--- a/libraries/evas/src/modules/loaders/generic/Makefile.am
+++ b/libraries/evas/src/modules/loaders/generic/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@evas_image_loader_generic_cflags@ \ 10@evas_image_loader_generic_cflags@ \
11@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14
15AM_CFLAGS = @WIN32_CFLAGS@
16 13
17 14
18if BUILD_LOADER_GENERIC 15if BUILD_LOADER_GENERIC
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.in b/libraries/evas/src/modules/loaders/generic/Makefile.in
index dfd5294..98bb45b 100644
--- a/libraries/evas/src/modules/loaders/generic/Makefile.in
+++ b/libraries/evas/src/modules/loaders/generic/Makefile.in
@@ -182,6 +182,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
182EVIL_CFLAGS = @EVIL_CFLAGS@ 182EVIL_CFLAGS = @EVIL_CFLAGS@
183EVIL_LIBS = @EVIL_LIBS@ 183EVIL_LIBS = @EVIL_LIBS@
184EXEEXT = @EXEEXT@ 184EXEEXT = @EXEEXT@
185EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
186EXOTIC_LIBS = @EXOTIC_LIBS@
185FGREP = @FGREP@ 187FGREP = @FGREP@
186FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 188FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
187FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 189FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -232,6 +234,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
232PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 234PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
233PIXMAN_LIBS = @PIXMAN_LIBS@ 235PIXMAN_LIBS = @PIXMAN_LIBS@
234PKG_CONFIG = @PKG_CONFIG@ 236PKG_CONFIG = @PKG_CONFIG@
237PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
238PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
235PNG_CFLAGS = @PNG_CFLAGS@ 239PNG_CFLAGS = @PNG_CFLAGS@
236PNG_LIBS = @PNG_LIBS@ 240PNG_LIBS = @PNG_LIBS@
237RANLIB = @RANLIB@ 241RANLIB = @RANLIB@
@@ -250,8 +254,6 @@ VERSION = @VERSION@
250VMAJ = @VMAJ@ 254VMAJ = @VMAJ@
251WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 255WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
252WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 256WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
253WIN32_CFLAGS = @WIN32_CFLAGS@
254WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
255XCB_CFLAGS = @XCB_CFLAGS@ 257XCB_CFLAGS = @XCB_CFLAGS@
256XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 258XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
257XCB_GL_LIBS = @XCB_GL_LIBS@ 259XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -325,8 +327,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
325evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 327evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
326evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 328evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
327evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 329evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
328evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
329evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
330evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 330evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
331evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 331evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
332evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 332evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -418,10 +418,8 @@ AM_CPPFLAGS = \
418@PIXMAN_CFLAGS@ \ 418@PIXMAN_CFLAGS@ \
419@evas_image_loader_generic_cflags@ \ 419@evas_image_loader_generic_cflags@ \
420@EINA_CFLAGS@ \ 420@EINA_CFLAGS@ \
421@EVIL_CFLAGS@ \ 421@EVIL_CFLAGS@
422@WIN32_CPPFLAGS@
423 422
424AM_CFLAGS = @WIN32_CFLAGS@
425@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) 423@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
426@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la 424@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la
427@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c 425@BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c
diff --git a/libraries/evas/src/modules/loaders/gif/Makefile.am b/libraries/evas/src/modules/loaders/gif/Makefile.am
index 9234370..3ae57a0 100644
--- a/libraries/evas/src/modules/loaders/gif/Makefile.am
+++ b/libraries/evas/src/modules/loaders/gif/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
10@evas_image_loader_gif_cflags@ \ 10@evas_image_loader_gif_cflags@ \
11@EINA_CFLAGS@ 11@EINA_CFLAGS@
12 12
13AM_CFLAGS = @WIN32_CFLAGS@
14
15if BUILD_LOADER_GIF 13if BUILD_LOADER_GIF
16if !EVAS_STATIC_BUILD_GIF 14if !EVAS_STATIC_BUILD_GIF
17 15
diff --git a/libraries/evas/src/modules/loaders/gif/Makefile.in b/libraries/evas/src/modules/loaders/gif/Makefile.in
index f32fcf4..a7fae36 100644
--- a/libraries/evas/src/modules/loaders/gif/Makefile.in
+++ b/libraries/evas/src/modules/loaders/gif/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \
418@evas_image_loader_gif_cflags@ \ 418@evas_image_loader_gif_cflags@ \
419@EINA_CFLAGS@ 419@EINA_CFLAGS@
420 420
421AM_CFLAGS = @WIN32_CFLAGS@
422@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) 421@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
423@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkg_LTLIBRARIES = module.la
424@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@module_la_SOURCES = evas_image_load_gif.c 423@BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@module_la_SOURCES = evas_image_load_gif.c
diff --git a/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c b/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c
index 9cd6f6e..dbb3584 100644
--- a/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c
+++ b/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c
@@ -483,10 +483,17 @@ _evas_image_load_frame_image_data(Image_Entry *ie, GifFileType *gif, Image_Entry
483 } 483 }
484 else 484 else
485 { 485 {
486 r = cmap->Colors[rows[i1][j1]].Red; 486 if (rows[i1][j1] == alpha)
487 g = cmap->Colors[rows[i1][j1]].Green; 487 {
488 b = cmap->Colors[rows[i1][j1]].Blue; 488 ptr++ ;
489 *ptr++ = ARGB_JOIN(0xff, r, g, b); 489 }
490 else
491 {
492 r = cmap->Colors[rows[i1][j1]].Red;
493 g = cmap->Colors[rows[i1][j1]].Green;
494 b = cmap->Colors[rows[i1][j1]].Blue;
495 *ptr++ = ARGB_JOIN(0xff, r, g, b);
496 }
490 } 497 }
491 } 498 }
492 } 499 }
diff --git a/libraries/evas/src/modules/loaders/ico/Makefile.am b/libraries/evas/src/modules/loaders/ico/Makefile.am
index 044dd0d..5f9b313 100644
--- a/libraries/evas/src/modules/loaders/ico/Makefile.am
+++ b/libraries/evas/src/modules/loaders/ico/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@
12@WIN32_CPPFLAGS@
13 12
14if BUILD_LOADER_ICO 13if BUILD_LOADER_ICO
15if !EVAS_STATIC_BUILD_ICO 14if !EVAS_STATIC_BUILD_ICO
@@ -27,7 +26,7 @@ else
27 26
28noinst_LTLIBRARIES = libevas_loader_ico.la 27noinst_LTLIBRARIES = libevas_loader_ico.la
29libevas_loader_ico_la_SOURCES = evas_image_load_ico.c 28libevas_loader_ico_la_SOURCES = evas_image_load_ico.c
30libevas_loader_ico_la_LIBADD = 29libevas_loader_ico_la_LIBADD =
31 30
32endif 31endif
33endif 32endif
diff --git a/libraries/evas/src/modules/loaders/ico/Makefile.in b/libraries/evas/src/modules/loaders/ico/Makefile.in
index f65ace0..2c9c95f 100644
--- a/libraries/evas/src/modules/loaders/ico/Makefile.in
+++ b/libraries/evas/src/modules/loaders/ico/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \
416@FREETYPE_CFLAGS@ \ 416@FREETYPE_CFLAGS@ \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@EVIL_CFLAGS@ \ 419@EVIL_CFLAGS@
420@WIN32_CPPFLAGS@
421 420
422@BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) 421@BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
423@BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkg_LTLIBRARIES = module.la
diff --git a/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c b/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c
index 6e31191..4239407 100644
--- a/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c
+++ b/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c
@@ -88,7 +88,7 @@ evas_image_load_file_head_ico(Image_Entry *ie, const char *file, const char *key
88 unsigned short word; 88 unsigned short word;
89 unsigned char byte; 89 unsigned char byte;
90 int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, 90 int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0,
91 hot_x = 0, hot_y = 0, bpp = 0, pdelta, search = -1, have_choice = 0, 91 bpp = 0, pdelta, search = -1, have_choice = 0,
92 hasa = 1; 92 hasa = 1;
93 unsigned int bmoffset, bmsize, fsize; 93 unsigned int bmoffset, bmsize, fsize;
94 unsigned short reserved, type, count; 94 unsigned short reserved, type, count;
@@ -182,10 +182,10 @@ evas_image_load_file_head_ico(Image_Entry *ie, const char *file, const char *key
182 if (!read_uchar(map, fsize, &position, &byte)) goto close_file; 182 if (!read_uchar(map, fsize, &position, &byte)) goto close_file;
183 if (!read_ushort(map, fsize, &position, &word)) goto close_file; 183 if (!read_ushort(map, fsize, &position, &word)) goto close_file;
184 if (type == CURSOR) planes = word; 184 if (type == CURSOR) planes = word;
185 else hot_x = word; 185 //else hot_x = word;
186 if (!read_ushort(map, fsize, &position, &word)) goto close_file; 186 if (!read_ushort(map, fsize, &position, &word)) goto close_file;
187 if (type == CURSOR) bpp = word; 187 if (type == CURSOR) bpp = word;
188 else hot_y = word; 188 //else hot_y = word;
189 if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; 189 if (!read_uint(map, fsize, &position, &bmsize)) goto close_file;
190 if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; 190 if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file;
191 if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; 191 if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file;
@@ -315,11 +315,11 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key
315 unsigned char byte; 315 unsigned char byte;
316 unsigned int dword; 316 unsigned int dword;
317 int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, 317 int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0,
318 hot_x = 0, hot_y = 0, bpp = 0, pdelta, search = -1, have_choice = 0, 318 bpp = 0, pdelta, search = -1, have_choice = 0,
319 stride, pstride, j, right_way_up = 0, diff_size = 0, cols2; 319 stride, pstride, j, right_way_up = 0, diff_size = 0, cols2;
320 unsigned int bmoffset, bmsize, bitcount, compression, imagesize, fsize, 320 unsigned int bmoffset, bmsize, bitcount, fsize,
321 colorsused, colorsimportant, *pal, *surface, *pix, none_zero_alpha = 0; 321 *pal, *surface, *pix, none_zero_alpha = 0;
322 unsigned short reserved, type, count, planes2; 322 unsigned short reserved, type, count;
323 unsigned char *maskbuf, *pixbuf, *p; 323 unsigned char *maskbuf, *pixbuf, *p;
324 struct { 324 struct {
325 int pdelta; 325 int pdelta;
@@ -411,10 +411,10 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key
411 if (!read_uchar(map, fsize, &position, &byte)) goto close_file; 411 if (!read_uchar(map, fsize, &position, &byte)) goto close_file;
412 if (!read_ushort(map, fsize, &position, &word)) goto close_file; 412 if (!read_ushort(map, fsize, &position, &word)) goto close_file;
413 if (type == 1) planes = word; 413 if (type == 1) planes = word;
414 else hot_x = word; 414 //else hot_x = word;
415 if (!read_ushort(map, fsize, &position, &word)) goto close_file; 415 if (!read_ushort(map, fsize, &position, &word)) goto close_file;
416 if (type == 1) bpp = word; 416 if (type == 1) bpp = word;
417 else hot_y = word; 417 //else hot_y = word;
418 if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; 418 if (!read_uint(map, fsize, &position, &bmsize)) goto close_file;
419 if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; 419 if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file;
420 if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; 420 if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file;
@@ -540,19 +540,19 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key
540 file, ie->w, ie->h, w, h); 540 file, ie->w, ie->h, w, h);
541 } 541 }
542 if (!read_ushort(map, fsize, &position, &word)) goto close_file; // planes 542 if (!read_ushort(map, fsize, &position, &word)) goto close_file; // planes
543 planes2 = word; 543 //planes2 = word;
544 if (!read_ushort(map, fsize, &position, &word)) goto close_file; // bitcount 544 if (!read_ushort(map, fsize, &position, &word)) goto close_file; // bitcount
545 bitcount = word; 545 bitcount = word;
546 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // compression 546 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // compression
547 compression = dword; 547 //compression = dword;
548 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // imagesize 548 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // imagesize
549 imagesize = dword; 549 //imagesize = dword;
550 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // z pixels per m 550 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // z pixels per m
551 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // y pizels per m 551 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // y pizels per m
552 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors used 552 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors used
553 colorsused = dword; 553 //colorsused = dword;
554 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors important 554 if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors important
555 colorsimportant = dword; 555 //colorsimportant = dword;
556 556
557 evas_cache_image_surface_alloc(ie, ie->w, ie->h); 557 evas_cache_image_surface_alloc(ie, ie->w, ie->h);
558 surface = evas_cache_image_pixels(ie); 558 surface = evas_cache_image_pixels(ie);
diff --git a/libraries/evas/src/modules/loaders/jpeg/Makefile.am b/libraries/evas/src/modules/loaders/jpeg/Makefile.am
index 2088ba8..a7a19ab 100644
--- a/libraries/evas/src/modules/loaders/jpeg/Makefile.am
+++ b/libraries/evas/src/modules/loaders/jpeg/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_jpeg_cflags@ \ 11@evas_image_loader_jpeg_cflags@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14
15AM_CFLAGS = @WIN32_CFLAGS@
16 13
17if BUILD_LOADER_JPEG 14if BUILD_LOADER_JPEG
18if !EVAS_STATIC_BUILD_JPEG 15if !EVAS_STATIC_BUILD_JPEG
diff --git a/libraries/evas/src/modules/loaders/jpeg/Makefile.in b/libraries/evas/src/modules/loaders/jpeg/Makefile.in
index 7c0ca18..4945f85 100644
--- a/libraries/evas/src/modules/loaders/jpeg/Makefile.in
+++ b/libraries/evas/src/modules/loaders/jpeg/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_jpeg_cflags@ \ 419@evas_image_loader_jpeg_cflags@ \
420@EVIL_CFLAGS@ \ 420@EVIL_CFLAGS@
421@WIN32_CPPFLAGS@
422 421
423AM_CFLAGS = @WIN32_CFLAGS@
424@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) 422@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
425@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la 423@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la
426@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_load_jpeg.c 424@BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_load_jpeg.c
diff --git a/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c b/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
index 797c76d..73a7310 100644
--- a/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
+++ b/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
@@ -272,7 +272,7 @@ evas_image_load_file_head_jpeg_internal(Image_Entry *ie,
272 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; 272 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
273 return EINA_FALSE; 273 return EINA_FALSE;
274 } 274 }
275 jpeg_create_decompress(&cinfo); 275 jpeg_create_decompress(&cinfo);
276 276
277 if (_evas_jpeg_membuf_src(&cinfo, map, length)) 277 if (_evas_jpeg_membuf_src(&cinfo, map, length))
278 { 278 {
@@ -508,11 +508,11 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie,
508 unsigned int x, y, l, i, scans; 508 unsigned int x, y, l, i, scans;
509 int region = 0; 509 int region = 0;
510 /* rotation setting */ 510 /* rotation setting */
511 unsigned int tmp; 511 unsigned int ie_w = 0, ie_h = 0;
512 unsigned int load_region_x = 0, load_region_y = 0; 512 unsigned int load_region_x = 0, load_region_y = 0;
513 unsigned int load_region_w = 0, load_region_h = 0; 513 unsigned int load_region_w = 0, load_region_h = 0;
514 int degree = 0; 514 volatile int degree = 0;
515 Eina_Bool change_wh = EINA_FALSE; 515 volatile Eina_Bool change_wh = EINA_FALSE;
516 Eina_Bool line_done = EINA_FALSE; 516 Eina_Bool line_done = EINA_FALSE;
517 517
518 if (ie->flags.rotated) 518 if (ie->flags.rotated)
@@ -582,9 +582,13 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie,
582 582
583 if (change_wh) 583 if (change_wh)
584 { 584 {
585 tmp = ie->w; 585 ie_w = ie->h;
586 ie->w = ie->h; 586 ie_h = ie->w;
587 ie->h = tmp; 587 }
588 else
589 {
590 ie_w = ie->w;
591 ie_h = ie->h;
588 } 592 }
589 593
590 if ((ie->load_opts.region.w > 0) && (ie->load_opts.region.h > 0)) 594 if ((ie->load_opts.region.w > 0) && (ie->load_opts.region.h > 0))
@@ -629,20 +633,31 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie,
629 cinfo.region_h = ie->load_opts.region.h; 633 cinfo.region_h = ie->load_opts.region.h;
630#endif 634#endif
631 } 635 }
632 if ((!region) && ((w != ie->w) || (h != ie->h))) 636 if ((!region) && ((w != ie_w) || (h != ie_h)))
633 { 637 {
634 // race condition, the file could have change from when we call header 638 // race condition, the file could have change from when we call header
635 // this test will not solve the problem with region code. 639 // this test will not solve the problem with region code.
636 jpeg_destroy_decompress(&cinfo); 640 jpeg_destroy_decompress(&cinfo);
637 _evas_jpeg_membuf_src_term(&cinfo); 641 _evas_jpeg_membuf_src_term(&cinfo);
638 *error = EVAS_LOAD_ERROR_GENERIC; 642 *error = EVAS_LOAD_ERROR_GENERIC;
639 return EINA_FALSE; 643 return EINA_FALSE;
640 } 644 }
641 if ((region) && 645 if ((region) &&
642 ((ie->w != ie->load_opts.region.w) || (ie->h != ie->load_opts.region.h))) 646 ((ie_w != ie->load_opts.region.w) || (ie_h != ie->load_opts.region.h)))
643 { 647 {
644 ie->w = ie->load_opts.region.w; 648 ie_w = ie->load_opts.region.w;
645 ie->h = ie->load_opts.region.h; 649 ie_h = ie->load_opts.region.h;
650 if (change_wh)
651 {
652 ie->w = ie_h;
653 ie->h = ie_w;
654 }
655 else
656 {
657 ie->w = ie_w;
658 ie->h = ie_h;
659 }
660
646 } 661 }
647 662
648 if (!(((cinfo.out_color_space == JCS_RGB) && 663 if (!(((cinfo.out_color_space == JCS_RGB) &&
@@ -971,31 +986,24 @@ done:
971 if (ie->flags.rotated) 986 if (ie->flags.rotated)
972 { 987 {
973 DATA32 *data1, *data2, *to, *from; 988 DATA32 *data1, *data2, *to, *from;
974 int x, y, w, h, hw; 989 int lx, ly, lw, lh, hw;
975
976 if (change_wh)
977 {
978 tmp = ie->w;
979 ie->w = ie->h;
980 ie->h = tmp;
981 }
982 990
983 w = ie->w; 991 lw = ie->w;
984 h = ie->h; 992 lh = ie->h;
985 hw =w * h; 993 hw =lw * lh;
986 994
987 data1 = evas_cache_image_pixels(ie); 995 data1 = evas_cache_image_pixels(ie);
988 996
989 if (degree == 180) 997 if (degree == 180)
990 { 998 {
991 DATA32 tmp; 999 DATA32 tmpd;
992 1000
993 data2 = data1 + (h * w) -1; 1001 data2 = data1 + (lh * lw) -1;
994 for (x = (w * h) / 2; --x >= 0;) 1002 for (lx = (lw * lh) / 2; --lx >= 0;)
995 { 1003 {
996 tmp = *data1; 1004 tmpd = *data1;
997 *data1 = *data2; 1005 *data1 = *data2;
998 *data2 = tmp; 1006 *data2 = tmpd;
999 data1++; 1007 data1++;
1000 data2--; 1008 data2--;
1001 } 1009 }
@@ -1008,26 +1016,26 @@ done:
1008 1016
1009 if (degree == 90) 1017 if (degree == 90)
1010 { 1018 {
1011 to = data1 + w - 1; 1019 to = data1 + lw - 1;
1012 hw = -hw - 1; 1020 hw = -hw - 1;
1013 } 1021 }
1014 else if (degree == 270) 1022 else if (degree == 270)
1015 { 1023 {
1016 to = data1 + hw - w; 1024 to = data1 + hw - lw;
1017 w = -w; 1025 lw = -lw;
1018 hw = hw + 1; 1026 hw = hw + 1;
1019 } 1027 }
1020 1028
1021 if (to) 1029 if (to)
1022 { 1030 {
1023 from = data2; 1031 from = data2;
1024 for (x = ie->w; --x >= 0;) 1032 for (lx = ie->w; --lx >= 0;)
1025 { 1033 {
1026 for (y =ie->h; --y >= 0;) 1034 for (ly =ie->h; --ly >= 0;)
1027 { 1035 {
1028 *to = *from; 1036 *to = *from;
1029 from++; 1037 from++;
1030 to += w; 1038 to += lw;
1031 } 1039 }
1032 to += hw; 1040 to += hw;
1033 } 1041 }
@@ -1046,6 +1054,7 @@ done:
1046 ie->load_opts.region.h = load_region_h; 1054 ie->load_opts.region.h = load_region_h;
1047 } 1055 }
1048 } 1056 }
1057
1049 if (line_done) 1058 if (line_done)
1050 { 1059 {
1051 jpeg_destroy_decompress(&cinfo); 1060 jpeg_destroy_decompress(&cinfo);
diff --git a/libraries/evas/src/modules/loaders/pmaps/Makefile.am b/libraries/evas/src/modules/loaders/pmaps/Makefile.am
index dc07a32..6fc3d6d 100644
--- a/libraries/evas/src/modules/loaders/pmaps/Makefile.am
+++ b/libraries/evas/src/modules/loaders/pmaps/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_pmaps_cflags@ \ 11@evas_image_loader_pmaps_cflags@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14
15AM_CFLAGS = @WIN32_CFLAGS@
16 13
17if BUILD_LOADER_PMAPS 14if BUILD_LOADER_PMAPS
18if !EVAS_STATIC_BUILD_PMAPS 15if !EVAS_STATIC_BUILD_PMAPS
diff --git a/libraries/evas/src/modules/loaders/pmaps/Makefile.in b/libraries/evas/src/modules/loaders/pmaps/Makefile.in
index 745e79b..c44904a 100644
--- a/libraries/evas/src/modules/loaders/pmaps/Makefile.in
+++ b/libraries/evas/src/modules/loaders/pmaps/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_pmaps_cflags@ \ 419@evas_image_loader_pmaps_cflags@ \
420@EVIL_CFLAGS@ \ 420@EVIL_CFLAGS@
421@WIN32_CPPFLAGS@
422 421
423AM_CFLAGS = @WIN32_CFLAGS@
424@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) 422@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
425@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkg_LTLIBRARIES = module.la 423@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkg_LTLIBRARIES = module.la
426@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@module_la_SOURCES = evas_image_load_pmaps.c 424@BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@module_la_SOURCES = evas_image_load_pmaps.c
diff --git a/libraries/evas/src/modules/loaders/png/Makefile.am b/libraries/evas/src/modules/loaders/png/Makefile.am
index f9387a5..884cdec 100644
--- a/libraries/evas/src/modules/loaders/png/Makefile.am
+++ b/libraries/evas/src/modules/loaders/png/Makefile.am
@@ -9,8 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_png_cflags@ \ 11@evas_image_loader_png_cflags@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14 13
15if BUILD_LOADER_PNG 14if BUILD_LOADER_PNG
16if !EVAS_STATIC_BUILD_PNG 15if !EVAS_STATIC_BUILD_PNG
diff --git a/libraries/evas/src/modules/loaders/png/Makefile.in b/libraries/evas/src/modules/loaders/png/Makefile.in
index 3bd4919..13352bc 100644
--- a/libraries/evas/src/modules/loaders/png/Makefile.in
+++ b/libraries/evas/src/modules/loaders/png/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -417,8 +417,7 @@ AM_CPPFLAGS = \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_png_cflags@ \ 419@evas_image_loader_png_cflags@ \
420@EVIL_CFLAGS@ \ 420@EVIL_CFLAGS@
421@WIN32_CPPFLAGS@
422 421
423@BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) 422@BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
424@BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la 423@BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la
diff --git a/libraries/evas/src/modules/loaders/psd/Makefile.am b/libraries/evas/src/modules/loaders/psd/Makefile.am
index 8b06348..a87e492 100644
--- a/libraries/evas/src/modules/loaders/psd/Makefile.am
+++ b/libraries/evas/src/modules/loaders/psd/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@
12@WIN32_CPPFLAGS@
13 12
14if BUILD_LOADER_PSD 13if BUILD_LOADER_PSD
15if !EVAS_STATIC_BUILD_PSD 14if !EVAS_STATIC_BUILD_PSD
@@ -27,7 +26,7 @@ else
27 26
28noinst_LTLIBRARIES = libevas_loader_psd.la 27noinst_LTLIBRARIES = libevas_loader_psd.la
29libevas_loader_psd_la_SOURCES = evas_image_load_psd.c 28libevas_loader_psd_la_SOURCES = evas_image_load_psd.c
30libevas_loader_psd_la_LIBADD = 29libevas_loader_psd_la_LIBADD =
31 30
32endif 31endif
33endif 32endif
diff --git a/libraries/evas/src/modules/loaders/psd/Makefile.in b/libraries/evas/src/modules/loaders/psd/Makefile.in
index 3dc9c38..b1987c6 100644
--- a/libraries/evas/src/modules/loaders/psd/Makefile.in
+++ b/libraries/evas/src/modules/loaders/psd/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \
416@FREETYPE_CFLAGS@ \ 416@FREETYPE_CFLAGS@ \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@EVIL_CFLAGS@ \ 419@EVIL_CFLAGS@
420@WIN32_CPPFLAGS@
421 420
422@BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) 421@BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
423@BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkg_LTLIBRARIES = module.la
diff --git a/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c b/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c
index 27f5f24..4449db0 100644
--- a/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c
+++ b/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c
@@ -509,12 +509,10 @@ get_single_channel(Image_Entry *ie __UNUSED__,
509 Eina_Bool compressed) 509 Eina_Bool compressed)
510{ 510{
511 unsigned int i, bpc; 511 unsigned int i, bpc;
512 unsigned short *tmp;
513 char headbyte; 512 char headbyte;
514 int c; 513 int c;
515 int pixels_count; 514 int pixels_count;
516 515
517 tmp = (unsigned short*)buffer;
518 bpc = (head->depth / 8); 516 bpc = (head->depth / 8);
519 pixels_count = head->width * head->height; 517 pixels_count = head->width * head->height;
520 518
@@ -569,7 +567,6 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
569{ 567{
570 unsigned int color_mode, resource_size, misc_info; 568 unsigned int color_mode, resource_size, misc_info;
571 unsigned short compressed; 569 unsigned short compressed;
572 unsigned int type;
573 void *surface = NULL; 570 void *surface = NULL;
574 571
575 *error = EVAS_LOAD_ERROR_CORRUPT_FILE; 572 *error = EVAS_LOAD_ERROR_CORRUPT_FILE;
@@ -602,10 +599,7 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
602 switch (head->depth) 599 switch (head->depth)
603 { 600 {
604 case 8: 601 case 8:
605 type = 1;
606 break;
607 case 16: 602 case 16:
608 type = 2;
609 break; 603 break;
610 default: 604 default:
611 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; 605 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
@@ -697,7 +691,6 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t
697{ 691{
698 unsigned int color_mode, resource_size, misc_info; 692 unsigned int color_mode, resource_size, misc_info;
699 unsigned short compressed; 693 unsigned short compressed;
700 unsigned int type;
701 void *surface; 694 void *surface;
702 695
703#define CHECK_RET(Call) \ 696#define CHECK_RET(Call) \
@@ -721,10 +714,7 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t
721 switch (head->depth) 714 switch (head->depth)
722 { 715 {
723 case 8: 716 case 8:
724 type = 1;
725 break;
726 case 16: 717 case 16:
727 type = 2;
728 break; 718 break;
729 default: 719 default:
730 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; 720 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
@@ -758,7 +748,7 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t
758Eina_Bool 748Eina_Bool
759read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error) 749read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error)
760{ 750{
761 unsigned int color_mode, resource_size, misc_info, size, i, j, data_size; 751 unsigned int color_mode, resource_size, misc_info, size, j, data_size;
762 unsigned short compressed; 752 unsigned short compressed;
763 unsigned int format, type; 753 unsigned int format, type;
764 unsigned char *kchannel = NULL; 754 unsigned char *kchannel = NULL;
@@ -841,7 +831,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
841 unsigned char *tmp = surface; 831 unsigned char *tmp = surface;
842 const unsigned char *limit = tmp + data_size; 832 const unsigned char *limit = tmp + data_size;
843 833
844 for (i = 0, j = 0; tmp < limit; tmp++, j++) 834 for (j = 0; tmp < limit; tmp++, j++)
845 { 835 {
846 int k; 836 int k;
847 837
@@ -857,7 +847,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
857 const unsigned char *limit = tmp + data_size; 847 const unsigned char *limit = tmp + data_size;
858 848
859 // The KChannel array really holds the alpha channel on this one. 849 // The KChannel array really holds the alpha channel on this one.
860 for (i = 0, j = 0; tmp < limit; tmp += 4, j++) 850 for (j = 0; tmp < limit; tmp += 4, j++)
861 { 851 {
862 tmp[0] = (tmp[0] * tmp[3]) >> 8; 852 tmp[0] = (tmp[0] * tmp[3]) >> 8;
863 tmp[1] = (tmp[1] * tmp[3]) >> 8; 853 tmp[1] = (tmp[1] * tmp[3]) >> 8;
diff --git a/libraries/evas/src/modules/loaders/svg/Makefile.am b/libraries/evas/src/modules/loaders/svg/Makefile.am
index 4b8d1b5..65820ce 100644
--- a/libraries/evas/src/modules/loaders/svg/Makefile.am
+++ b/libraries/evas/src/modules/loaders/svg/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_svg_cflags@ 11@evas_image_loader_svg_cflags@
12 12
13AM_CFLAGS = @WIN32_CFLAGS@
14
15if BUILD_LOADER_SVG 13if BUILD_LOADER_SVG
16if !EVAS_STATIC_BUILD_SVG 14if !EVAS_STATIC_BUILD_SVG
17 15
diff --git a/libraries/evas/src/modules/loaders/svg/Makefile.in b/libraries/evas/src/modules/loaders/svg/Makefile.in
index b742842..4d23de1 100644
--- a/libraries/evas/src/modules/loaders/svg/Makefile.in
+++ b/libraries/evas/src/modules/loaders/svg/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_svg_cflags@ 419@evas_image_loader_svg_cflags@
420 420
421AM_CFLAGS = @WIN32_CFLAGS@
422@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) 421@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
423@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkg_LTLIBRARIES = module.la
424@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@module_la_SOURCES = evas_image_load_svg.c 423@BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@module_la_SOURCES = evas_image_load_svg.c
diff --git a/libraries/evas/src/modules/loaders/tga/Makefile.am b/libraries/evas/src/modules/loaders/tga/Makefile.am
index 4d9e240..7cd8fed 100644
--- a/libraries/evas/src/modules/loaders/tga/Makefile.am
+++ b/libraries/evas/src/modules/loaders/tga/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@
12@WIN32_CPPFLAGS@
13 12
14if BUILD_LOADER_TGA 13if BUILD_LOADER_TGA
15if !EVAS_STATIC_BUILD_TGA 14if !EVAS_STATIC_BUILD_TGA
@@ -27,7 +26,7 @@ else
27 26
28noinst_LTLIBRARIES = libevas_loader_tga.la 27noinst_LTLIBRARIES = libevas_loader_tga.la
29libevas_loader_tga_la_SOURCES = evas_image_load_tga.c 28libevas_loader_tga_la_SOURCES = evas_image_load_tga.c
30libevas_loader_tga_la_LIBADD = 29libevas_loader_tga_la_LIBADD =
31 30
32endif 31endif
33endif 32endif
diff --git a/libraries/evas/src/modules/loaders/tga/Makefile.in b/libraries/evas/src/modules/loaders/tga/Makefile.in
index 4d822d1..d2a9271 100644
--- a/libraries/evas/src/modules/loaders/tga/Makefile.in
+++ b/libraries/evas/src/modules/loaders/tga/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \
416@FREETYPE_CFLAGS@ \ 416@FREETYPE_CFLAGS@ \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@EVIL_CFLAGS@ \ 419@EVIL_CFLAGS@
420@WIN32_CPPFLAGS@
421 420
422@BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) 421@BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
423@BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkg_LTLIBRARIES = module.la
diff --git a/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c b/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c
index 9b4073c..bab169b 100644
--- a/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c
+++ b/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c
@@ -76,10 +76,9 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key
76 unsigned char *seg = NULL, *filedata; 76 unsigned char *seg = NULL, *filedata;
77 tga_header *header; 77 tga_header *header;
78 tga_footer *footer, tfooter; 78 tga_footer *footer, tfooter;
79 char hasa = 0, footer_present = 0, vinverted = 0; 79 char hasa = 0;
80 int w = 0, h = 0, bpp; 80 int w = 0, h = 0, bpp;
81 int x, y; 81 int x, y;
82 int abits;
83 82
84 f = eina_file_open(file, EINA_FALSE); 83 f = eina_file_open(file, EINA_FALSE);
85 *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST; 84 *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
@@ -98,7 +97,7 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key
98 memcpy((unsigned char *)(&tfooter), 97 memcpy((unsigned char *)(&tfooter),
99 (unsigned char *)footer, 98 (unsigned char *)footer,
100 sizeof(tga_footer)); 99 sizeof(tga_footer));
101 printf("0\n"); 100 //printf("0\n");
102 if (!memcmp(tfooter.signature, TGA_SIGNATURE, sizeof(tfooter.signature))) 101 if (!memcmp(tfooter.signature, TGA_SIGNATURE, sizeof(tfooter.signature)))
103 { 102 {
104 if ((tfooter.dot == '.') && (tfooter.null == 0)) 103 if ((tfooter.dot == '.') && (tfooter.null == 0))
@@ -106,14 +105,12 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key
106 // footer is there and matches. this is a tga file - any problems now 105 // footer is there and matches. this is a tga file - any problems now
107 // are a corrupt file 106 // are a corrupt file
108 *error = EVAS_LOAD_ERROR_CORRUPT_FILE; 107 *error = EVAS_LOAD_ERROR_CORRUPT_FILE;
109 footer_present = 1;
110 } 108 }
111 } 109 }
112// else goto close_file; 110// else goto close_file;
113 printf("1\n"); 111 //printf("1\n");
114 112
115 filedata = (unsigned char *)filedata + sizeof(tga_header); 113 filedata = (unsigned char *)filedata + sizeof(tga_header);
116 vinverted = !(header->descriptor & TGA_DESC_VERTICAL);
117 switch (header->imageType) 114 switch (header->imageType)
118 { 115 {
119 case TGA_TYPE_COLOR_RLE: 116 case TGA_TYPE_COLOR_RLE:
@@ -131,7 +128,6 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key
131 if (!((bpp == 32) || (bpp == 24) || (bpp == 16) || (bpp == 8))) 128 if (!((bpp == 32) || (bpp == 24) || (bpp == 16) || (bpp == 8)))
132 goto close_file; 129 goto close_file;
133 if ((bpp == 32) && (header->descriptor & TGA_DESC_ABITS)) hasa = 1; 130 if ((bpp == 32) && (header->descriptor & TGA_DESC_ABITS)) hasa = 1;
134 abits = header->descriptor & TGA_DESC_ABITS;
135 // don't handle colormapped images 131 // don't handle colormapped images
136 if ((header->colorMapType) != 0) 132 if ((header->colorMapType) != 0)
137 goto close_file; 133 goto close_file;
diff --git a/libraries/evas/src/modules/loaders/tiff/Makefile.am b/libraries/evas/src/modules/loaders/tiff/Makefile.am
index f617c5e..1a53686 100644
--- a/libraries/evas/src/modules/loaders/tiff/Makefile.am
+++ b/libraries/evas/src/modules/loaders/tiff/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_tiff_cflags@ \ 11@evas_image_loader_tiff_cflags@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14
15AM_CFLAGS = @WIN32_CFLAGS@
16 13
17if BUILD_LOADER_TIFF 14if BUILD_LOADER_TIFF
18if !EVAS_STATIC_BUILD_TIFF 15if !EVAS_STATIC_BUILD_TIFF
diff --git a/libraries/evas/src/modules/loaders/tiff/Makefile.in b/libraries/evas/src/modules/loaders/tiff/Makefile.in
index 2b102a1..5976b63 100644
--- a/libraries/evas/src/modules/loaders/tiff/Makefile.in
+++ b/libraries/evas/src/modules/loaders/tiff/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_tiff_cflags@ \ 419@evas_image_loader_tiff_cflags@ \
420@EVIL_CFLAGS@ \ 420@EVIL_CFLAGS@
421@WIN32_CPPFLAGS@
422 421
423AM_CFLAGS = @WIN32_CFLAGS@
424@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) 422@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
425@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la 423@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la
426@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_load_tiff.c 424@BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_load_tiff.c
diff --git a/libraries/evas/src/modules/loaders/wbmp/Makefile.am b/libraries/evas/src/modules/loaders/wbmp/Makefile.am
index eed287a..61a4def 100644
--- a/libraries/evas/src/modules/loaders/wbmp/Makefile.am
+++ b/libraries/evas/src/modules/loaders/wbmp/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
8@FREETYPE_CFLAGS@ \ 8@FREETYPE_CFLAGS@ \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@
12@WIN32_CPPFLAGS@
13 12
14if BUILD_LOADER_WBMP 13if BUILD_LOADER_WBMP
15if !EVAS_STATIC_BUILD_WBMP 14if !EVAS_STATIC_BUILD_WBMP
@@ -27,7 +26,7 @@ else
27 26
28noinst_LTLIBRARIES = libevas_loader_wbmp.la 27noinst_LTLIBRARIES = libevas_loader_wbmp.la
29libevas_loader_wbmp_la_SOURCES = evas_image_load_wbmp.c 28libevas_loader_wbmp_la_SOURCES = evas_image_load_wbmp.c
30libevas_loader_wbmp_la_LIBADD = 29libevas_loader_wbmp_la_LIBADD =
31 30
32endif 31endif
33endif 32endif
diff --git a/libraries/evas/src/modules/loaders/wbmp/Makefile.in b/libraries/evas/src/modules/loaders/wbmp/Makefile.in
index 5c01e1c..aba23a2 100644
--- a/libraries/evas/src/modules/loaders/wbmp/Makefile.in
+++ b/libraries/evas/src/modules/loaders/wbmp/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \
416@FREETYPE_CFLAGS@ \ 416@FREETYPE_CFLAGS@ \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@EVIL_CFLAGS@ \ 419@EVIL_CFLAGS@
420@WIN32_CPPFLAGS@
421 420
422@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) 421@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
423@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkg_LTLIBRARIES = module.la 422@BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkg_LTLIBRARIES = module.la
diff --git a/libraries/evas/src/modules/loaders/xpm/Makefile.am b/libraries/evas/src/modules/loaders/xpm/Makefile.am
index b8cb1fa..83c9970 100644
--- a/libraries/evas/src/modules/loaders/xpm/Makefile.am
+++ b/libraries/evas/src/modules/loaders/xpm/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
9@PIXMAN_CFLAGS@ \ 9@PIXMAN_CFLAGS@ \
10@EINA_CFLAGS@ \ 10@EINA_CFLAGS@ \
11@evas_image_loader_xpm_cflags@ \ 11@evas_image_loader_xpm_cflags@ \
12@EVIL_CFLAGS@ \ 12@EVIL_CFLAGS@
13@WIN32_CPPFLAGS@
14
15AM_CFLAGS = @WIN32_CFLAGS@
16 13
17if BUILD_LOADER_XPM 14if BUILD_LOADER_XPM
18if !EVAS_STATIC_BUILD_XPM 15if !EVAS_STATIC_BUILD_XPM
diff --git a/libraries/evas/src/modules/loaders/xpm/Makefile.in b/libraries/evas/src/modules/loaders/xpm/Makefile.in
index 6383d9e..cfce4ad 100644
--- a/libraries/evas/src/modules/loaders/xpm/Makefile.in
+++ b/libraries/evas/src/modules/loaders/xpm/Makefile.in
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
181EVIL_CFLAGS = @EVIL_CFLAGS@ 181EVIL_CFLAGS = @EVIL_CFLAGS@
182EVIL_LIBS = @EVIL_LIBS@ 182EVIL_LIBS = @EVIL_LIBS@
183EXEEXT = @EXEEXT@ 183EXEEXT = @EXEEXT@
184EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
185EXOTIC_LIBS = @EXOTIC_LIBS@
184FGREP = @FGREP@ 186FGREP = @FGREP@
185FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ 187FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
186FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ 188FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
231PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 233PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
232PIXMAN_LIBS = @PIXMAN_LIBS@ 234PIXMAN_LIBS = @PIXMAN_LIBS@
233PKG_CONFIG = @PKG_CONFIG@ 235PKG_CONFIG = @PKG_CONFIG@
236PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
237PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
234PNG_CFLAGS = @PNG_CFLAGS@ 238PNG_CFLAGS = @PNG_CFLAGS@
235PNG_LIBS = @PNG_LIBS@ 239PNG_LIBS = @PNG_LIBS@
236RANLIB = @RANLIB@ 240RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
249VMAJ = @VMAJ@ 253VMAJ = @VMAJ@
250WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ 254WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
251WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ 255WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
252WIN32_CFLAGS = @WIN32_CFLAGS@
253WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
254XCB_CFLAGS = @XCB_CFLAGS@ 256XCB_CFLAGS = @XCB_CFLAGS@
255XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ 257XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
256XCB_GL_LIBS = @XCB_GL_LIBS@ 258XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
324evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ 326evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
325evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ 327evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
326evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ 328evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
327evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
328evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ 329evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 330evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 331evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \
417@PIXMAN_CFLAGS@ \ 417@PIXMAN_CFLAGS@ \
418@EINA_CFLAGS@ \ 418@EINA_CFLAGS@ \
419@evas_image_loader_xpm_cflags@ \ 419@evas_image_loader_xpm_cflags@ \
420@EVIL_CFLAGS@ \ 420@EVIL_CFLAGS@
421@WIN32_CPPFLAGS@
422 421
423AM_CFLAGS = @WIN32_CFLAGS@
424@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) 422@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
425@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkg_LTLIBRARIES = module.la 423@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkg_LTLIBRARIES = module.la
426@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@module_la_SOURCES = evas_image_load_xpm.c 424@BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@module_la_SOURCES = evas_image_load_xpm.c
diff --git a/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c b/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
index c764f6d..f00f92d 100644
--- a/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
+++ b/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
@@ -153,7 +153,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
153 position = 0; 153 position = 0;
154 if (length < 9) 154 if (length < 9)
155 { 155 {
156 ERR("XPM ERROR: file size, %i, is to small", length); 156 ERR("XPM ERROR: file size, %zd, is to small", length);
157 eina_file_close(f); 157 eina_file_close(f);
158 *error = EVAS_LOAD_ERROR_CORRUPT_FILE; 158 *error = EVAS_LOAD_ERROR_CORRUPT_FILE;
159 return EINA_FALSE; 159 return EINA_FALSE;
@@ -170,7 +170,6 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
170 170
171 if (strncmp("/* XPM */", map, 9)) 171 if (strncmp("/* XPM */", map, 9))
172 { 172 {
173 ERR("XPM ERROR: header not found");
174 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; 173 *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
175 goto on_error; 174 goto on_error;
176 } 175 }
generated by cgit v1.1 at 2024-07-05 06:36:06 +0000