aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-10-15 12:10:20 +0200
committerEli Zaretskii2010-10-15 12:10:20 +0200
commit9cf66cf2ead7e6eabe0d8d9c72e2c24710d5d8c9 (patch)
treeb9b77cfacebd514e3a21afa7bae50f174a74a5bd /src
parent204380176cb3edf83951e3c8442bf959f077ea2a (diff)
downloademacs-9cf66cf2ead7e6eabe0d8d9c72e2c24710d5d8c9.tar.gz
emacs-9cf66cf2ead7e6eabe0d8d9c72e2c24710d5d8c9.zip
image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4d5a0db9a97..567bf2868e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-10-15 Eli Zaretskii <eliz@gnu.org>
2
3 * image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
4
12010-10-15 Tassilo Horn <tassilo@member.fsf.org> 52010-10-15 Tassilo Horn <tassilo@member.fsf.org>
2 6
3 * Makefile.in (really-oldXMenu): Fix typo in variable name that 7 * Makefile.in (really-oldXMenu): Fix typo in variable name that
diff --git a/src/image.c b/src/image.c
index bd742138195..b7edf05fea8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6793,8 +6793,9 @@ tiff_load (struct frame *f, struct image *img)
6793 memsrc.len = SBYTES (specified_data); 6793 memsrc.len = SBYTES (specified_data);
6794 memsrc.index = 0; 6794 memsrc.index = 0;
6795 6795
6796 /* Casting return value avoids a GCC warning on W32. */ 6796 /* Casting arguments return value avoids a GCC warning on W32. */
6797 tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r", &memsrc, 6797 tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r",
6798 (thandle_t) &memsrc,
6798 (TIFFReadWriteProc) tiff_read_from_memory, 6799 (TIFFReadWriteProc) tiff_read_from_memory,
6799 (TIFFReadWriteProc) tiff_write_from_memory, 6800 (TIFFReadWriteProc) tiff_write_from_memory,
6800 tiff_seek_in_memory, 6801 tiff_seek_in_memory,