cirros-testvm/src-cirros/buildroot-2015.05/package/efl/libevas/0001-giflib.patch

   1 Adjust source code to work with giflib 5.1x
   2
   3 From http://giflib.sourceforge.net/gif_lib.html: GIF file openers and
   4 closers - DGifOpenFileName(), DGifOpenFileHandle(), DGifOpen(),
   5 DGifClose(), EGifOpenFileName(), EGifOpenFileHandle(), EGifOpen(), and
   6 EGifClose() - all now take a final integer address argument. If
   7 non-null, this is used to pass back an error code when the function
   8 returns NULL.
   9
  10 Downloaded from
  11 http://commit.cvs.pld.groups.com.ru/332837-packagesevas_fix_building_with_giflib_51_rel_6
  12
  13 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  14
  15 diff -uNr evas-1.7.10.org/src/modules/loaders/gif/evas_image_load_gif.c evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c
  16 --- evas-1.7.10.org/src/modules/loaders/gif/evas_image_load_gif.c       2013-08-01 17:41:35.000000000 +0200
  17 +++ evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c   2015-01-26 19:44:20.132955194 +0100
  18 @@ -338,7 +338,7 @@
  19
  20     if (!cmap)
  21       {
  22 -        DGifCloseFile(gif);
  23 +        DGifCloseFile(gif, NULL);
  24          for (i = 0; i < scale_h; i++)
  25            {
  26               free(rows[i]);
  27 @@ -725,7 +725,7 @@
  28     if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
  29         IMG_TOO_BIG(w, h))
  30       {
  31 -        DGifCloseFile(gif);
  32 +        DGifCloseFile(gif, NULL);
  33          if (IMG_TOO_BIG(w, h))
  34            *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
  35          else
  36 @@ -740,7 +740,7 @@
  37          if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
  38            {
  39               /* PrintGifError(); */
  40 -             DGifCloseFile(gif);
  41 +             DGifCloseFile(gif, NULL);
  42               *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
  43               return EINA_FALSE;
  44            }
  45 @@ -754,7 +754,7 @@
  46               if (DGifGetImageDesc(gif) == GIF_ERROR)
  47                 {
  48                    /* PrintGifError(); */
  49 -                  DGifCloseFile(gif);
  50 +                  DGifCloseFile(gif, NULL);
  51                    *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
  52                    return EINA_FALSE;
  53                 }
  54 @@ -762,7 +762,7 @@
  55               if (DGifGetCode(gif, &img_code, &img) == GIF_ERROR)
  56                 {
  57                    /* PrintGifError(); */
  58 -                  DGifCloseFile(gif);
  59 +                  DGifCloseFile(gif, NULL);
  60                    *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
  61                    return EINA_FALSE;
  62                 }
  63 @@ -818,7 +818,7 @@
  64          ie->frames = NULL;
  65       }
  66
  67 -   DGifCloseFile(gif);
  68 +   DGifCloseFile(gif, NULL);
  69     *error = EVAS_LOAD_ERROR_NONE;
  70     return EINA_TRUE;
  71  }
  72 @@ -885,7 +885,7 @@
  73       }
  74
  75     ie->frames = eina_list_append(ie->frames, frame);
  76 -   DGifCloseFile(gif);
  77 +   DGifCloseFile(gif, NULL);
  78     return EINA_TRUE;
  79  }
  80
  81 @@ -959,7 +959,7 @@
  82                    *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
  83                    return EINA_FALSE;
  84                 }
  85 -             DGifCloseFile(gif);
  86 +             DGifCloseFile(gif, NULL);
  87               *error = EVAS_LOAD_ERROR_NONE;
  88               return EINA_TRUE;
  89            }
  90 @@ -1080,7 +1080,7 @@
  91           }
  92       } while (rec != TERMINATE_RECORD_TYPE);
  93
  94 -   DGifCloseFile(gif);
  95 +   DGifCloseFile(gif, NULL);
  96     return duration;
  97  }
  98