diff options
| author | Eli Zaretskii | 2011-02-01 21:46:21 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-01 21:46:21 +0200 |
| commit | 3082f6173c4d06d0d1b9d860f656a1e1c08f3c65 (patch) | |
| tree | 3bcc7dbeede41b29e305a03f15efb19e97978c8a /src | |
| parent | 26d504d7f3473de2bee435f475956634dc26347e (diff) | |
| download | emacs-3082f6173c4d06d0d1b9d860f656a1e1c08f3c65.tar.gz emacs-3082f6173c4d06d0d1b9d860f656a1e1c08f3c65.zip | |
Fix a compiler warning in image.c.
image.c (tiff_load): Avoid compiler warning in 2nd arg to TIFFClientOpen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f46ea50d30c..74165302824 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * image.c (tiff_load): Avoid compiler warning in 2nd arg to | ||
| 4 | TIFFClientOpen. | ||
| 5 | |||
| 1 | 2011-02-01 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2011-02-01 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * xsmfns.c (ice_connection_closed): Call delete_read_fd. | 8 | * xsmfns.c (ice_connection_closed): Call delete_read_fd. |
diff --git a/src/image.c b/src/image.c index 3b846bcc400..8303fac4c98 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -6798,7 +6798,7 @@ tiff_load (struct frame *f, struct image *img) | |||
| 6798 | memsrc.len = SBYTES (specified_data); | 6798 | memsrc.len = SBYTES (specified_data); |
| 6799 | memsrc.index = 0; | 6799 | memsrc.index = 0; |
| 6800 | 6800 | ||
| 6801 | tiff = fn_TIFFClientOpen ("memory_source", "r", &memsrc, | 6801 | tiff = fn_TIFFClientOpen ("memory_source", "r", (thandle_t)&memsrc, |
| 6802 | (TIFFReadWriteProc) tiff_read_from_memory, | 6802 | (TIFFReadWriteProc) tiff_read_from_memory, |
| 6803 | (TIFFReadWriteProc) tiff_write_from_memory, | 6803 | (TIFFReadWriteProc) tiff_write_from_memory, |
| 6804 | tiff_seek_in_memory, | 6804 | tiff_seek_in_memory, |