diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-07-15 08:36:50 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-07-15 08:56:21 +0000 |
| commit | 64404d37152700c946764ea0eb6f352612d57c13 (patch) | |
| tree | 685398ded1408d995b78f6d0bcac4675c0aa01ae /main/imlib2/imlib2-giflib5.patch | |
| parent | 9feb913b7e1beed4fd57761f75c623a3c9f2330e (diff) | |
| download | aports-64404d37152700c946764ea0eb6f352612d57c13.tar.bz2 aports-64404d37152700c946764ea0eb6f352612d57c13.tar.xz | |
main/imlib2: rebuild against giflib 5.1
Diffstat (limited to 'main/imlib2/imlib2-giflib5.patch')
| -rw-r--r-- | main/imlib2/imlib2-giflib5.patch | 64 |
1 files changed, 57 insertions, 7 deletions
diff --git a/main/imlib2/imlib2-giflib5.patch b/main/imlib2/imlib2-giflib5.patch index 5a7b38d134..1bd8627d38 100644 --- a/main/imlib2/imlib2-giflib5.patch +++ b/main/imlib2/imlib2-giflib5.patch @@ -1,14 +1,64 @@ ---- a/src/modules/loaders/loader_gif.c.orig -+++ b/src/modules/loaders/loader_gif.c -@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct +diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c +--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 ++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 +@@ -36,7 +36,7 @@ #endif if (fd < 0) return 0; -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) +- gif = DGifOpenFileHandle(fd); + gif = DGifOpenFileHandle(fd, NULL); -+#else - gif = DGifOpenFileHandle(fd); -+#endif if (!gif) { close(fd); +@@ -60,13 +60,13 @@ + h = gif->Image.Height; + if (!IMAGE_DIMENSIONS_OK(w, h)) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + rows = malloc(h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + for (i = 0; i < h; i++) +@@ -78,7 +78,7 @@ + rows[i] = malloc(w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + if (rows[i]) +@@ -150,7 +150,7 @@ + im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); + if (!im->data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return 0; + } +@@ -181,7 +181,7 @@ + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); +@@ -198,7 +198,7 @@ + { + progress(im, 100, 0, last_y, w, h); + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); |