3 files changed, 10 insertions, 22 deletions

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 = \
 @FREETYPE_CFLAGS@ \
 @PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
-@EVIL_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EVIL_CFLAGS@
 
 if BUILD_LOADER_PSD
 if !EVAS_STATIC_BUILD_PSD
@@ -27,7 +26,7 @@ else
 
 noinst_LTLIBRARIES = libevas_loader_psd.la
 libevas_loader_psd_la_SOURCES = evas_image_load_psd.c
-libevas_loader_psd_la_LIBADD = 
+libevas_loader_psd_la_LIBADD =
 
 endif
 endif
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@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
 PIXMAN_LIBS = @PIXMAN_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_CFLAGS = @PNG_CFLAGS@
 PNG_LIBS = @PNG_LIBS@
 RANLIB = @RANLIB@
@@ -249,8 +253,6 @@ VERSION = @VERSION@
 VMAJ = @VMAJ@
 WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
 WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-WIN32_CFLAGS = @WIN32_CFLAGS@
-WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
 XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
 evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
 evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
 evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
-evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
 evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
 evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
 evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \
 @FREETYPE_CFLAGS@ \
 @PIXMAN_CFLAGS@ \
 @EINA_CFLAGS@ \
-@EVIL_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EVIL_CFLAGS@
 
 @BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
 @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__,
                    Eina_Bool compressed)
 {
    unsigned int i, bpc;
-   unsigned short *tmp;
    char headbyte;
    int c;
    int pixels_count;
 
-   tmp = (unsigned short*)buffer;
    bpc = (head->depth / 8);
    pixels_count = head->width * head->height;
 
@@ -569,7 +567,6 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
 {
    unsigned int color_mode, resource_size, misc_info;
    unsigned short compressed;
-   unsigned int type;
    void *surface = NULL;
 
    *error = EVAS_LOAD_ERROR_CORRUPT_FILE;
@@ -602,10 +599,7 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
    switch (head->depth)
      {
       case 8:
-         type = 1;
-         break;
       case 16:
-         type = 2;
          break;
       default:
          *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
 {
    unsigned int color_mode, resource_size, misc_info;
    unsigned short compressed;
-   unsigned int type;
    void *surface;
 
 #define CHECK_RET(Call)                  \
@@ -721,10 +714,7 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t
    switch (head->depth)
      {
       case 8:
-         type = 1;
-         break;
       case 16:
-         type = 2;
          break;
       default:
          *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
 Eina_Bool
 read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error)
 {
-   unsigned int color_mode, resource_size, misc_info, size, i, j, data_size;
+   unsigned int color_mode, resource_size, misc_info, size, j, data_size;
    unsigned short compressed;
    unsigned int format, type;
    unsigned char *kchannel = NULL;
@@ -841,7 +831,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
         unsigned char *tmp = surface;
         const unsigned char *limit = tmp + data_size;
 
-        for (i = 0, j = 0; tmp < limit; tmp++, j++)
+        for (j = 0; tmp < limit; tmp++, j++)
           {
              int k;
 
@@ -857,7 +847,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_
         const unsigned char *limit = tmp + data_size;
 
         // The KChannel array really holds the alpha channel on this one.
-        for (i = 0, j = 0; tmp < limit; tmp += 4, j++)
+        for (j = 0; tmp < limit; tmp += 4, j++)
           {
              tmp[0] = (tmp[0] * tmp[3]) >> 8;
              tmp[1] = (tmp[1] * tmp[3]) >> 8;