[EGIT] [core/efl] master 02/02: evas - tga loader - ignore origin as it leads to valid tga's not loading

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9890c2b135f85fbbd3bf1ccfed90597ff65cfa71

commit 9890c2b135f85fbbd3bf1ccfed90597ff65cfa71
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Mon Feb 1 18:05:16 2021 +0000

    evas - tga loader - ignore origin as it leads to valid tga's not loading
    
    @fix
---
 .../evas/image_loaders/tga/evas_image_load_tga.c     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c 
b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
index d8ef67fc59..34ee83e0b1 100644
--- a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
+++ b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
@@ -77,7 +77,7 @@ evas_image_load_file_head_tga(void *loader_data,
    tga_footer *footer, tfooter;
    char hasa = 0;
    int w, h, bpp;
-   int x, y;
+//   int x, y;
    Eina_Bool r = EINA_FALSE;
 
    *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
@@ -104,7 +104,6 @@ evas_image_load_file_head_tga(void *loader_data,
           }
      }
 //   else goto close_file;
-   //printf("1\n");
 
    filedata = (unsigned char *)filedata + sizeof(tga_header);
    switch (header->imageType)
@@ -135,13 +134,14 @@ evas_image_load_file_head_tga(void *loader_data,
          (header->colorMapSize == 24) ||
          (header->colorMapSize == 32)))
      goto close_file;
-   x = (header->xOriginHi << 8) | (header->xOriginLo);
-   y = (header->yOriginHi << 8) | (header->yOriginLo);
+//   x = (header->xOriginHi << 8) | (header->xOriginLo);
+//   y = (header->yOriginHi << 8) | (header->yOriginLo);
    w = (header->widthHi << 8) | header->widthLo;
    h = (header->heightHi << 8) | header->heightLo;
    // x origin gerater that width, y origin greater than height - wrong file
-   if ((x >= w) || (y >= h))
-     goto close_file;
+//   if ((x >= w) || (y >= h))
+//     goto close_file;
+   printf("x\n");
    // if descriptor has either of the top 2 bits set... not tga
    if (header->descriptor & 0xc0)
      goto close_file;
@@ -237,13 +237,13 @@ evas_image_load_file_data_tga(void *loader_data,
          (header->colorMapSize == 24) ||
          (header->colorMapSize == 32)))
      goto close_file;
-   x = (header->xOriginHi << 8) | (header->xOriginLo);
-   y = (header->yOriginHi << 8) | (header->yOriginLo);
+//   x = (header->xOriginHi << 8) | (header->xOriginLo);
+//   y = (header->yOriginHi << 8) | (header->yOriginLo);
    w = (header->widthHi << 8) | header->widthLo;
    h = (header->heightHi << 8) | header->heightLo;
    // x origin gerater that width, y origin greater than height - wrong file
-   if ((x >= w) || (y >= h))
-     goto close_file;
+//   if ((x >= w) || (y >= h))
+//     goto close_file;
    // if descriptor has either of the top 2 bits set... not tga
    if (header->descriptor & 0xc0)
      goto close_file;

--