diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/loaders/tga | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/modules/loaders/tga/Makefile.am | 5 | ||||
-rw-r--r-- | libraries/evas/src/modules/loaders/tga/Makefile.in | 11 | ||||
-rw-r--r-- | libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c | 10 |
3 files changed, 10 insertions, 16 deletions
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 | ||
14 | if BUILD_LOADER_TGA | 13 | if BUILD_LOADER_TGA |
15 | if !EVAS_STATIC_BUILD_TGA | 14 | if !EVAS_STATIC_BUILD_TGA |
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_tga.la | 27 | noinst_LTLIBRARIES = libevas_loader_tga.la |
29 | libevas_loader_tga_la_SOURCES = evas_image_load_tga.c | 28 | libevas_loader_tga_la_SOURCES = evas_image_load_tga.c |
30 | libevas_loader_tga_la_LIBADD = | 29 | libevas_loader_tga_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
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@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_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; |