From: Makoto Fujiwara <makoto@ki.nu>
To: emacs-devel@gnu.org
Subject: giflib-5.1.0 (GIF image format library) API change
Date: Sun, 15 Jun 2014 17:23:38 +0900 [thread overview]
Message-ID: <yfmwqci8tth.wl%makoto@ki.nu> (raw)
Hi, should be already fixed, I am presume, but I needed
attached remedy to build,
Thanks a lot,
---
Makoto Fujiwara,
Chiba, Japan, Narita Airport and Disneyland prefecture.
$NetBSD$
mage.c:7417:7: error: too few arguments to function 'DGifCloseFile'
emacs-current/work/.buildlink/include/gif_lib.h:183:9:
note: declared here
--- ./src/image.c.orig 2014-06-14 13:15:41.000000000 +0900
+++ ./src/image.c 2014-06-15 08:39:42.000000000 +0900
@@ -7409,13 +7409,13 @@
}
#endif
}
-
+ int * return_value;
/* Before reading entire contents, check the declared image size. */
if (!check_image_size (f, gif->SWidth, gif->SHeight))
{
image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
/* Read entire contents. */
@@ -7423,8 +7423,8 @@
if (rc == GIF_ERROR || gif->ImageCount <= 0)
{
image_error ("Error reading `%s'", img->spec, Qnil);
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
/* Which sub-image are we to display? */
@@ -7435,8 +7435,8 @@
{
image_error ("Invalid image number `%s' in image `%s'",
image_number, img->spec);
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
}
@@ -7453,8 +7453,8 @@
if (!check_image_size (f, width, height))
{
image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
/* Check that the selected subimages fit. It's not clear whether
@@ -7471,16 +7471,16 @@
&& 0 <= subimg_left && subimg_left <= width - subimg_width))
{
image_error ("Subimage does not fit in image", Qnil, Qnil);
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
}
/* Create the X image and pixmap. */
if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0))
{
- fn_DGifCloseFile (gif);
- return 0;
+ fn_DGifCloseFile (gif, return_value);
+ return return_value;
}
/* Clear the part of the screen image not covered by the image.
@@ -7650,7 +7650,7 @@
Fcons (make_number (gif->ImageCount),
img->lisp_data));
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, return_value);
/* Maybe fill in the background field while we have ximg handy. */
if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
next reply other threads:[~2014-06-15 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-15 8:23 Makoto Fujiwara [this message]
2014-06-15 11:23 ` giflib-5.1.0 (GIF image format library) API change Eric S. Raymond
2014-06-15 22:32 ` Glenn Morris
2014-06-16 0:06 ` Eric S. Raymond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yfmwqci8tth.wl%makoto@ki.nu \
--to=makoto@ki.nu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).