diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 18:30:10 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 18:30:10 -0400 |
commit | f2a2724e5cf97f019c089f381ee79708cb9b8ede (patch) | |
tree | 819e7b125fa8999b9c9f85a22a8ebdafdf79b4f9 /pcr/emacs-lucid/emacs-24.3-giflib5.patch | |
parent | 9d51ec5b15207912f80b8de68146b342b120fcd4 (diff) | |
download | abslibre-f2a2724e5cf97f019c089f381ee79708cb9b8ede.tar.gz abslibre-f2a2724e5cf97f019c089f381ee79708cb9b8ede.tar.bz2 abslibre-f2a2724e5cf97f019c089f381ee79708cb9b8ede.zip |
pcr/emacs-lucid: new giflib
Diffstat (limited to 'pcr/emacs-lucid/emacs-24.3-giflib5.patch')
-rw-r--r-- | pcr/emacs-lucid/emacs-24.3-giflib5.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch index b8571abb2..f58c31907 100644 --- a/pcr/emacs-lucid/emacs-24.3-giflib5.patch +++ b/pcr/emacs-lucid/emacs-24.3-giflib5.patch @@ -24,3 +24,74 @@ if (!gif) { image_error ("Cannot open memory source `%s'", img->spec, Qnil); +@@ -7225,7 +7225,11 @@ + if (!check_image_size (f, gif->SWidth, gif->SHeight)) + { + image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7234,7 +7238,11 @@ + if (rc == GIF_ERROR || gif->ImageCount <= 0) + { + image_error ("Error reading `%s'", img->spec, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7246,7 +7254,11 @@ + { + image_error ("Invalid image number `%s' in image `%s'", + image_number, img->spec); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + } +@@ -7264,14 +7276,22 @@ + if (!check_image_size (f, width, height)) + { + image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + + /* Create the X image and pixmap. */ + if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) + { ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7447,7 +7467,11 @@ + Fcons (make_number (gif->ImageCount), + img->lisp_data)); + ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + + /* Maybe fill in the background field while we have ximg handy. */ + if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |