Mercurial > hg > xemacs-beta
annotate src/glyphs-eimage.c @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Mar 2010 01:22:51 -0500 |
| parents | 7e57c0575a15 |
| children | 97eb4942aec8 |
| rev | line source |
|---|---|
| 428 | 1 /* EImage-specific Lisp objects. |
| 2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995 Tinker Systems | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
5 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005, 2010 Ben Wing |
| 428 | 6 Copyright (C) 1995 Sun Microsystems |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: Not in FSF. */ | |
| 26 | |
| 2959 | 27 /* Originally part of glyphs.c. |
| 28 | |
| 428 | 29 GIF/JPEG support added by Ben Wing for 19.14 |
| 30 PNG support added by Bill Perry for 19.14 | |
| 31 Improved GIF/JPEG support added by Bill Perry for 19.14 | |
| 32 Cleanup/simplification of error handling by Ben Wing for 19.14 | |
| 33 GIF support changed to external Gifreader lib by Jareth Hein for 21.0 | |
| 34 Many changes for color work and optimizations by Jareth Hein for 21.0 | |
| 35 Switch of GIF/JPEG/PNG to new EImage intermediate code by Jareth Hein for 21.0 | |
| 36 TIFF code by Jareth Hein for 21.0 | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
37 GIF support changed to external giflib by Jerry James for 21.5 |
| 428 | 38 TODO: |
| 39 Convert images.el to C and stick it in here? | |
| 3094 | 40 This file is really repetitious; can we refactor? |
| 428 | 41 */ |
| 42 | |
| 43 #include <config.h> | |
| 44 #include "lisp.h" | |
| 45 #include "lstream.h" | |
| 46 #include "console.h" | |
| 872 | 47 #include "device-impl.h" |
| 428 | 48 #include "faces.h" |
| 49 #include "glyphs.h" | |
| 872 | 50 #include "objects-impl.h" |
| 428 | 51 |
| 52 #include "buffer.h" | |
| 53 #include "frame.h" | |
| 54 #include "opaque.h" | |
| 442 | 55 #include "window.h" |
| 428 | 56 |
| 57 #include "sysfile.h" | |
| 58 | |
| 59 #ifdef HAVE_PNG | |
| 1743 | 60 |
| 61 BEGIN_C_DECLS | |
| 62 | |
| 647 | 63 #define message message_ /* Yuck */ |
| 428 | 64 #include <png.h> |
| 647 | 65 #undef message |
| 1743 | 66 |
| 67 END_C_DECLS | |
| 68 | |
| 428 | 69 #else |
| 70 #include <setjmp.h> | |
| 71 #endif | |
| 72 #include "file-coding.h" | |
| 73 | |
| 74 #ifdef HAVE_TIFF | |
| 75 DEFINE_IMAGE_INSTANTIATOR_FORMAT (tiff); | |
| 76 Lisp_Object Qtiff; | |
| 77 #endif | |
| 78 | |
| 79 #ifdef HAVE_JPEG | |
| 80 DEFINE_IMAGE_INSTANTIATOR_FORMAT (jpeg); | |
| 81 Lisp_Object Qjpeg; | |
| 82 #endif | |
| 83 | |
| 84 #ifdef HAVE_GIF | |
| 85 DEFINE_IMAGE_INSTANTIATOR_FORMAT (gif); | |
| 86 Lisp_Object Qgif; | |
| 87 #endif | |
| 88 | |
| 89 #ifdef HAVE_PNG | |
| 90 DEFINE_IMAGE_INSTANTIATOR_FORMAT (png); | |
| 91 Lisp_Object Qpng; | |
| 92 #endif | |
| 93 | |
| 94 | |
| 95 #ifdef HAVE_JPEG | |
| 96 | |
| 97 /********************************************************************** | |
| 98 * JPEG * | |
| 99 **********************************************************************/ | |
| 100 | |
| 1743 | 101 BEGIN_C_DECLS |
| 102 | |
| 4854 | 103 #ifdef WIN32_ANY |
| 104 /* #### Yuck! More horrifitude. tiffio.h, below, and sysfile.h above, | |
| 105 include <windows.h>, which defines INT32 and INT16, the former | |
| 106 differently and incompatibly from jmorecfg.h, included by jpeglib.h. We | |
| 107 can disable the stuff in jmorecfg.h by defining XMD_H (clever, huh?); | |
| 108 then we define these typedefs the way that <windows.h> wants them (which | |
| 109 is more correct, anyway; jmorecfg.h defines INT32 as `long'). */ | |
| 2500 | 110 #define XMD_H |
| 111 typedef signed int INT32; | |
| 112 typedef signed short INT16; | |
|
4326
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
113 |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
114 /* And another one... jmorecfg.h defines the 'boolean' type as int, |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
115 which conflicts with the standard Windows 'boolean' definition as |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
116 unsigned char. Ref: http://www.asmail.be/msg0054688232.html */ |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
117 #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
118 typedef unsigned char boolean; |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
119 #endif |
|
a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3839
diff
changeset
|
120 #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ |
| 2500 | 121 #endif |
| 122 | |
|
5009
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
123 /* Yet more breakage... jmorecfg.h unconditionally defines FAR either as |
|
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
124 "far" or as blank. Windef.h unconditionally defines FAR as "far". |
|
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
125 We'll avoid the compile warning by redefing FAR the way windows defines it, |
|
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
126 after loading the JPEG headers. */ |
|
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
127 #undef FAR |
| 428 | 128 #include <jpeglib.h> |
| 129 #include <jerror.h> | |
|
5009
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
130 #undef FAR |
|
2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
Vin Shelton <acs@xemacs.org>
parents:
4982
diff
changeset
|
131 #define FAR far |
| 1743 | 132 |
| 133 END_C_DECLS | |
| 428 | 134 |
| 135 /*#define USE_TEMP_FILES_FOR_JPEG_IMAGES 1*/ | |
| 136 static void | |
| 137 jpeg_validate (Lisp_Object instantiator) | |
| 138 { | |
| 139 file_or_data_must_be_present (instantiator); | |
| 140 } | |
| 141 | |
| 142 static Lisp_Object | |
| 442 | 143 jpeg_normalize (Lisp_Object inst, Lisp_Object console_type, |
| 2286 | 144 Lisp_Object UNUSED (dest_mask)) |
| 428 | 145 { |
| 146 return simple_image_type_normalize (inst, console_type, Qjpeg); | |
| 147 } | |
| 148 | |
| 149 static int | |
| 150 jpeg_possible_dest_types (void) | |
| 151 { | |
| 152 return IMAGE_COLOR_PIXMAP_MASK; | |
| 153 } | |
| 154 | |
| 155 /* To survive the otherwise baffling complexity of making sure | |
| 156 everything gets cleaned up in the presence of an error, we | |
| 157 use an unwind_protect(). */ | |
| 158 | |
| 159 struct jpeg_unwind_data | |
| 160 { | |
| 161 /* Stream that we need to close */ | |
| 162 FILE *instream; | |
| 163 /* Object that holds state info for JPEG decoding */ | |
| 164 struct jpeg_decompress_struct *cinfo_ptr; | |
| 165 /* EImage data */ | |
| 2367 | 166 Binbyte *eimage; |
| 428 | 167 }; |
| 168 | |
| 169 static Lisp_Object | |
| 170 jpeg_instantiate_unwind (Lisp_Object unwind_obj) | |
| 171 { | |
| 172 struct jpeg_unwind_data *data = | |
| 173 (struct jpeg_unwind_data *) get_opaque_ptr (unwind_obj); | |
| 174 | |
| 175 free_opaque_ptr (unwind_obj); | |
| 176 if (data->cinfo_ptr) | |
| 177 jpeg_destroy_decompress (data->cinfo_ptr); | |
| 178 | |
| 179 if (data->instream) | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
180 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
181 retry_fclose (data->instream); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
182 data->instream = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
183 } |
| 428 | 184 |
| 1726 | 185 if (data->eimage) |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
186 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
187 xfree (data->eimage); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
188 data->eimage = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
189 } |
| 428 | 190 |
| 191 return Qnil; | |
| 192 } | |
| 193 | |
| 194 /* | |
| 195 * ERROR HANDLING: | |
| 196 * | |
| 197 * The JPEG library's standard error handler (jerror.c) is divided into | |
| 198 * several "methods" which you can override individually. This lets you | |
| 199 * adjust the behavior without duplicating a lot of code, which you might | |
| 200 * have to update with each future release. | |
| 201 * | |
| 202 * Our example here shows how to override the "error_exit" method so that | |
| 203 * control is returned to the library's caller when a fatal error occurs, | |
| 204 * rather than calling exit() as the standard error_exit method does. | |
| 205 * | |
| 206 * We use C's setjmp/longjmp facility to return control. This means that the | |
| 207 * routine which calls the JPEG library must first execute a setjmp() call to | |
| 208 * establish the return point. We want the replacement error_exit to do a | |
| 209 * longjmp(). But we need to make the setjmp buffer accessible to the | |
| 210 * error_exit routine. To do this, we make a private extension of the | |
| 211 * standard JPEG error handler object. (If we were using C++, we'd say we | |
| 212 * were making a subclass of the regular error handler.) | |
| 213 * | |
| 214 * Here's the extended error handler struct: | |
| 215 */ | |
| 216 | |
| 217 struct my_jpeg_error_mgr | |
| 218 { | |
| 219 struct jpeg_error_mgr pub; /* "public" fields */ | |
| 220 jmp_buf setjmp_buffer; /* for return to caller */ | |
| 221 }; | |
| 222 | |
| 223 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 224 METHODDEF(void) | |
| 225 #else | |
| 226 METHODDEF void | |
| 227 #endif | |
| 2286 | 228 our_init_source (j_decompress_ptr UNUSED (cinfo)) |
| 428 | 229 { |
| 230 } | |
| 231 | |
| 232 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 233 METHODDEF(boolean) | |
| 234 #else | |
| 235 METHODDEF boolean | |
| 236 #endif | |
| 237 our_fill_input_buffer (j_decompress_ptr cinfo) | |
| 238 { | |
| 239 /* Insert a fake EOI marker */ | |
| 240 struct jpeg_source_mgr *src = cinfo->src; | |
| 241 static JOCTET buffer[2]; | |
| 242 | |
| 243 buffer[0] = (JOCTET) 0xFF; | |
| 244 buffer[1] = (JOCTET) JPEG_EOI; | |
| 245 | |
| 246 src->next_input_byte = buffer; | |
| 247 src->bytes_in_buffer = 2; | |
| 248 return TRUE; | |
| 249 } | |
| 250 | |
| 251 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 252 METHODDEF(void) | |
| 253 #else | |
| 254 METHODDEF void | |
| 255 #endif | |
| 256 our_skip_input_data (j_decompress_ptr cinfo, long num_bytes) | |
| 257 { | |
| 258 struct jpeg_source_mgr *src = NULL; | |
| 259 | |
| 260 src = (struct jpeg_source_mgr *) cinfo->src; | |
| 261 | |
| 262 if (!src) | |
| 647 | 263 return; |
| 264 else if (num_bytes > (long) src->bytes_in_buffer) | |
| 428 | 265 { |
| 647 | 266 ERREXIT (cinfo, JERR_INPUT_EOF); |
| 267 /*NOTREACHED*/ | |
| 268 } | |
| 428 | 269 |
| 270 src->bytes_in_buffer -= num_bytes; | |
| 271 src->next_input_byte += num_bytes; | |
| 272 } | |
| 273 | |
| 274 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 275 METHODDEF(void) | |
| 276 #else | |
| 277 METHODDEF void | |
| 278 #endif | |
| 2286 | 279 our_term_source (j_decompress_ptr UNUSED (cinfo)) |
| 428 | 280 { |
| 281 } | |
| 282 | |
| 283 typedef struct | |
| 284 { | |
| 285 struct jpeg_source_mgr pub; | |
| 286 } our_jpeg_source_mgr; | |
| 287 | |
| 288 static void | |
| 665 | 289 jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, Bytecount len) |
| 428 | 290 { |
| 291 struct jpeg_source_mgr *src; | |
| 292 | |
| 293 if (cinfo->src == NULL) | |
| 294 { /* first time for this JPEG object? */ | |
| 295 cinfo->src = (struct jpeg_source_mgr *) | |
| 296 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, | |
| 297 sizeof(our_jpeg_source_mgr)); | |
| 298 src = (struct jpeg_source_mgr *) cinfo->src; | |
| 299 src->next_input_byte = data; | |
| 300 } | |
| 301 src = (struct jpeg_source_mgr *) cinfo->src; | |
| 302 src->init_source = our_init_source; | |
| 303 src->fill_input_buffer = our_fill_input_buffer; | |
| 304 src->skip_input_data = our_skip_input_data; | |
| 305 src->resync_to_restart = jpeg_resync_to_restart; /* use default method */ | |
| 306 src->term_source = our_term_source; | |
| 307 src->bytes_in_buffer = len; | |
| 308 src->next_input_byte = data; | |
| 309 } | |
| 310 | |
| 311 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 312 METHODDEF(void) | |
| 313 #else | |
| 314 METHODDEF void | |
| 315 #endif | |
| 316 my_jpeg_error_exit (j_common_ptr cinfo) | |
| 317 { | |
| 318 /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */ | |
| 319 struct my_jpeg_error_mgr *myerr = (struct my_jpeg_error_mgr *) cinfo->err; | |
| 320 | |
| 321 /* Return control to the setjmp point */ | |
| 322 longjmp (myerr->setjmp_buffer, 1); | |
| 323 } | |
| 324 | |
| 325 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61) | |
| 326 METHODDEF(void) | |
| 327 #else | |
| 328 METHODDEF void | |
| 329 #endif | |
| 330 my_jpeg_output_message (j_common_ptr cinfo) | |
| 331 { | |
| 771 | 332 Extbyte buffer[JMSG_LENGTH_MAX]; |
| 867 | 333 Ibyte *intbuf; |
| 428 | 334 |
| 335 /* Create the message */ | |
| 336 (*cinfo->err->format_message) (cinfo, buffer); | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
337 intbuf = EXTERNAL_TO_ITEXT (buffer, Qjpeg_error_message_encoding); |
| 771 | 338 warn_when_safe (Qjpeg, Qinfo, "%s", intbuf); |
| 428 | 339 } |
| 340 | |
| 341 /* The code in this routine is based on example.c from the JPEG library | |
| 342 source code and from gif_instantiate() */ | |
| 343 static void | |
| 344 jpeg_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, | |
| 2959 | 345 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
| 428 | 346 int dest_mask, Lisp_Object domain) |
| 347 { | |
| 440 | 348 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
| 428 | 349 /* It is OK for the unwind data to be local to this function, |
| 350 because the unwind-protect is always executed when this | |
| 351 stack frame is still valid. */ | |
| 352 struct jpeg_unwind_data unwind; | |
| 353 int speccount = specpdl_depth (); | |
| 354 | |
| 355 /* This struct contains the JPEG decompression parameters and pointers to | |
| 356 * working space (which is allocated as needed by the JPEG library). | |
| 357 */ | |
| 358 struct jpeg_decompress_struct cinfo; | |
| 359 /* We use our private extension JPEG error handler. | |
| 360 * Note that this struct must live as long as the main JPEG parameter | |
| 361 * struct, to avoid dangling-pointer problems. | |
| 362 */ | |
| 363 struct my_jpeg_error_mgr jerr; | |
| 364 | |
| 365 /* Step -1: First record our unwind-protect, which will clean up after | |
| 366 any exit, normal or not */ | |
| 367 | |
| 368 xzero (unwind); | |
| 369 record_unwind_protect (jpeg_instantiate_unwind, make_opaque_ptr (&unwind)); | |
| 370 | |
| 371 /* Step 1: allocate and initialize JPEG decompression object */ | |
| 372 | |
| 373 /* We set up the normal JPEG error routines, then override error_exit. */ | |
| 374 cinfo.err = jpeg_std_error (&jerr.pub); | |
| 375 jerr.pub.error_exit = my_jpeg_error_exit; | |
| 376 jerr.pub.output_message = my_jpeg_output_message; | |
| 377 | |
| 378 /* Establish the setjmp return context for my_error_exit to use. */ | |
| 379 if (setjmp (jerr.setjmp_buffer)) | |
| 380 { | |
| 381 /* If we get here, the JPEG code has signaled an error. | |
| 382 * We need to clean up the JPEG object, close the input file, and return. | |
| 383 */ | |
| 384 | |
| 385 { | |
| 386 Lisp_Object errstring; | |
| 771 | 387 Extbyte buffer[JMSG_LENGTH_MAX]; |
| 428 | 388 |
| 389 /* Create the message */ | |
| 390 (*cinfo.err->format_message) ((j_common_ptr) &cinfo, buffer); | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
391 errstring = build_extstring (buffer, Qjpeg_error_message_encoding); |
| 428 | 392 |
| 393 signal_image_error_2 ("JPEG decoding error", | |
| 394 errstring, instantiator); | |
| 395 } | |
| 396 } | |
| 397 | |
| 398 /* Now we can initialize the JPEG decompression object. */ | |
| 399 jpeg_create_decompress (&cinfo); | |
| 400 unwind.cinfo_ptr = &cinfo; | |
| 401 | |
| 402 /* Step 2: specify data source (eg, a file) */ | |
| 403 | |
| 404 { | |
| 405 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | |
| 2367 | 406 const Binbyte *bytes; |
| 665 | 407 Bytecount len; |
| 428 | 408 |
| 409 /* #### This is a definite problem under Mule due to the amount of | |
| 410 stack data it might allocate. Need to be able to convert and | |
| 411 write out to a file. */ | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
412 LISP_STRING_TO_SIZED_EXTERNAL (data, bytes, len, Qbinary); |
| 428 | 413 jpeg_memory_src (&cinfo, (JOCTET *) bytes, len); |
| 414 } | |
| 415 | |
| 416 /* Step 3: read file parameters with jpeg_read_header() */ | |
| 417 | |
| 418 jpeg_read_header (&cinfo, TRUE); | |
| 419 /* We can ignore the return value from jpeg_read_header since | |
| 420 * (a) suspension is not possible with the stdio data source, and | |
| 421 * (b) we passed TRUE to reject a tables-only JPEG file as an error. | |
| 422 * See libjpeg.doc for more info. | |
| 423 */ | |
| 424 | |
| 425 { | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
426 UINT_64_BIT pixels_sq; |
| 428 | 427 int jpeg_gray = 0; /* if we're dealing with a grayscale */ |
| 428 /* Step 4: set parameters for decompression. */ | |
| 429 | |
| 430 /* Now that we're using EImages, send all data as 24bit color. | |
| 431 The backend routine will take care of any necessary reductions. | |
| 432 We do have to handle the grayscale case ourselves, however. */ | |
| 433 if (cinfo.jpeg_color_space == JCS_GRAYSCALE) | |
| 434 { | |
| 435 cinfo.out_color_space = JCS_GRAYSCALE; | |
| 436 jpeg_gray = 1; | |
| 437 } | |
| 438 else | |
| 439 { | |
| 440 /* we're relying on the jpeg driver to do any other conversions, | |
| 441 or signal an error if the conversion isn't supported. */ | |
| 442 cinfo.out_color_space = JCS_RGB; | |
| 443 } | |
| 444 | |
| 445 /* Step 5: Start decompressor */ | |
| 446 jpeg_start_decompress (&cinfo); | |
| 447 | |
| 448 /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/ | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
449 pixels_sq = |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
450 (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height; |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
451 if (pixels_sq > ((size_t) -1) / 3) |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
452 signal_image_error ("JPEG image too large to instantiate", instantiator); |
| 2367 | 453 unwind.eimage = |
| 454 xnew_binbytes (cinfo.output_width * cinfo.output_height * 3); | |
| 428 | 455 if (!unwind.eimage) |
| 456 signal_image_error("Unable to allocate enough memory for image", instantiator); | |
| 457 | |
| 458 { | |
| 459 JSAMPARRAY row_buffer; /* Output row buffer */ | |
| 460 JSAMPLE *jp; | |
| 461 int row_stride; /* physical row width in output buffer */ | |
| 2367 | 462 Binbyte *op = unwind.eimage; |
| 428 | 463 |
| 464 /* We may need to do some setup of our own at this point before reading | |
| 465 * the data. After jpeg_start_decompress() we have the correct scaled | |
| 466 * output image dimensions available | |
| 467 * We need to make an output work buffer of the right size. | |
| 468 */ | |
| 469 /* JSAMPLEs per row in output buffer. */ | |
| 470 row_stride = cinfo.output_width * cinfo.output_components; | |
| 471 /* Make a one-row-high sample array that will go away when done | |
| 472 with image */ | |
| 473 row_buffer = ((*cinfo.mem->alloc_sarray) | |
| 474 ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1)); | |
| 475 | |
| 476 /* Here we use the library's state variable cinfo.output_scanline as the | |
| 477 * loop counter, so that we don't have to keep track ourselves. | |
| 478 */ | |
| 479 while (cinfo.output_scanline < cinfo.output_height) | |
| 480 { | |
| 481 int i; | |
| 482 | |
| 483 /* jpeg_read_scanlines expects an array of pointers to scanlines. | |
| 484 * Here the array is only one element long, but you could ask for | |
| 485 * more than one scanline at a time if that's more convenient. | |
| 486 */ | |
| 487 (void) jpeg_read_scanlines (&cinfo, row_buffer, 1); | |
| 488 jp = row_buffer[0]; | |
| 647 | 489 for (i = 0; i < (int) cinfo.output_width; i++) |
| 428 | 490 { |
| 491 int clr; | |
| 492 if (jpeg_gray) | |
| 493 { | |
| 2367 | 494 Binbyte val; |
| 428 | 495 #if (BITS_IN_JSAMPLE == 8) |
| 2367 | 496 val = (Binbyte) *jp++; |
| 428 | 497 #else /* other option is 12 */ |
| 2367 | 498 val = (Binbyte) (*jp++ >> 4); |
| 428 | 499 #endif |
| 500 for (clr = 0; clr < 3; clr++) /* copy the same value into RGB */ | |
| 501 *op++ = val; | |
| 502 } | |
| 503 else | |
| 504 { | |
| 505 for (clr = 0; clr < 3; clr++) | |
| 506 #if (BITS_IN_JSAMPLE == 8) | |
| 2367 | 507 *op++ = (Binbyte)*jp++; |
| 428 | 508 #else /* other option is 12 */ |
| 2367 | 509 *op++ = (Binbyte)(*jp++ >> 4); |
| 428 | 510 #endif |
| 511 } | |
| 512 } | |
| 513 } | |
| 514 } | |
| 515 } | |
| 516 | |
| 517 /* Step 6.5: Create the pixmap and set up the image instance */ | |
| 518 /* now instantiate */ | |
| 442 | 519 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
| 428 | 520 init_image_instance_from_eimage, |
| 521 (ii, cinfo.output_width, cinfo.output_height, 1, | |
| 522 unwind.eimage, dest_mask, | |
| 2959 | 523 instantiator, pointer_fg, pointer_bg, domain)); |
| 428 | 524 |
| 525 /* Step 7: Finish decompression */ | |
| 526 | |
| 527 jpeg_finish_decompress (&cinfo); | |
| 528 /* We can ignore the return value since suspension is not possible | |
| 529 * with the stdio data source. | |
| 530 */ | |
| 531 | |
| 532 /* And we're done! */ | |
| 533 /* This will clean up everything else. */ | |
| 771 | 534 unbind_to (speccount); |
| 428 | 535 } |
| 536 | |
| 537 #endif /* HAVE_JPEG */ | |
| 538 | |
| 539 #ifdef HAVE_GIF | |
| 540 /********************************************************************** | |
| 541 * GIF * | |
| 542 **********************************************************************/ | |
| 543 | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
544 #include <gif_lib.h> |
| 428 | 545 |
| 546 static void | |
| 547 gif_validate (Lisp_Object instantiator) | |
| 548 { | |
| 549 file_or_data_must_be_present (instantiator); | |
| 550 } | |
| 551 | |
| 552 static Lisp_Object | |
| 442 | 553 gif_normalize (Lisp_Object inst, Lisp_Object console_type, |
| 2286 | 554 Lisp_Object UNUSED (dest_mask)) |
| 428 | 555 { |
| 556 return simple_image_type_normalize (inst, console_type, Qgif); | |
| 557 } | |
| 558 | |
| 559 static int | |
| 560 gif_possible_dest_types (void) | |
| 561 { | |
| 562 return IMAGE_COLOR_PIXMAP_MASK; | |
| 563 } | |
| 564 | |
| 565 /* To survive the otherwise baffling complexity of making sure | |
| 566 everything gets cleaned up in the presence of an error, we | |
| 567 use an unwind_protect(). */ | |
| 568 | |
| 569 struct gif_unwind_data | |
| 570 { | |
| 2367 | 571 Binbyte *eimage; |
| 428 | 572 /* Object that holds the decoded data from a GIF file */ |
| 573 GifFileType *giffile; | |
| 574 }; | |
| 575 | |
| 576 static Lisp_Object | |
| 577 gif_instantiate_unwind (Lisp_Object unwind_obj) | |
| 578 { | |
| 579 struct gif_unwind_data *data = | |
| 580 (struct gif_unwind_data *) get_opaque_ptr (unwind_obj); | |
| 581 | |
| 582 free_opaque_ptr (unwind_obj); | |
| 583 if (data->giffile) | |
| 584 { | |
| 585 DGifCloseFile (data->giffile); | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
586 FreeSavedImages (data->giffile); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
587 data->giffile = 0; |
| 428 | 588 } |
| 647 | 589 if (data->eimage) |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
590 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
591 xfree (data->eimage); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
592 data->eimage = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
593 } |
| 428 | 594 |
| 595 return Qnil; | |
| 596 } | |
| 597 | |
| 598 typedef struct gif_memory_storage | |
| 599 { | |
| 2367 | 600 Binbyte *bytes; /* The data */ |
| 665 | 601 Bytecount len; /* How big is it? */ |
| 602 Bytecount index; /* Where are we? */ | |
| 428 | 603 } gif_memory_storage; |
| 604 | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
605 static int |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
606 gif_read_from_memory (GifFileType *gif, GifByteType *buf, int size) |
| 428 | 607 { |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
608 gif_memory_storage *mem = (gif_memory_storage *) gif->UserData; |
| 428 | 609 |
| 610 if (size > (mem->len - mem->index)) | |
| 647 | 611 return -1; |
| 612 memcpy (buf, mem->bytes + mem->index, size); | |
| 428 | 613 mem->index = mem->index + size; |
| 614 return size; | |
| 615 } | |
| 616 | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
617 static const char * |
|
5016
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4982
diff
changeset
|
618 gif_decode_error_string (void) |
| 428 | 619 { |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
620 switch (GifLastError ()) |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
621 { |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
622 case D_GIF_ERR_OPEN_FAILED: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
623 return "GIF error: unable to open"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
624 case D_GIF_ERR_READ_FAILED: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
625 return "GIF error: read failed"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
626 case D_GIF_ERR_NOT_GIF_FILE: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
627 return "GIF error: not a GIF file"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
628 case D_GIF_ERR_NO_SCRN_DSCR: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
629 return "GIF error: no Screen Descriptor detected"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
630 case D_GIF_ERR_NO_IMAG_DSCR: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
631 return "GIF error: no Image Descriptor detected"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
632 case D_GIF_ERR_NO_COLOR_MAP: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
633 return "GIF error: no global or local color map"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
634 case D_GIF_ERR_WRONG_RECORD: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
635 return "GIF error: wrong record type"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
636 case D_GIF_ERR_DATA_TOO_BIG: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
637 return "GIF error: image is larger than indicated by header"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
638 case D_GIF_ERR_NOT_ENOUGH_MEM: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
639 return "GIF error: out of memory"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
640 case D_GIF_ERR_CLOSE_FAILED: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
641 return "GIF error: failed to close file"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
642 case D_GIF_ERR_NOT_READABLE: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
643 return "GIF error: file is not readable"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
644 case D_GIF_ERR_IMAGE_DEFECT: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
645 return "GIF error: image is defective"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
646 case D_GIF_ERR_EOF_TOO_SOON: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
647 return "GIF error: image EOF detected before image complete"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
648 default: |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
649 return "GIF error: unknown error"; |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
650 } |
| 428 | 651 } |
| 652 | |
| 653 static void | |
| 654 gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, | |
| 2959 | 655 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
| 428 | 656 int dest_mask, Lisp_Object domain) |
| 657 { | |
| 440 | 658 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
| 428 | 659 /* It is OK for the unwind data to be local to this function, |
| 660 because the unwind-protect is always executed when this | |
| 661 stack frame is still valid. */ | |
| 662 struct gif_unwind_data unwind; | |
| 663 int speccount = specpdl_depth (); | |
| 664 gif_memory_storage mem_struct; | |
| 2367 | 665 Binbyte *bytes; |
| 665 | 666 Bytecount len; |
| 428 | 667 int height = 0; |
| 668 int width = 0; | |
| 669 | |
| 670 xzero (unwind); | |
| 671 record_unwind_protect (gif_instantiate_unwind, make_opaque_ptr (&unwind)); | |
| 672 | |
| 673 /* 1. Now decode the data. */ | |
| 674 | |
| 675 { | |
| 676 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | |
| 677 | |
| 678 assert (!NILP (data)); | |
| 679 | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
680 LISP_STRING_TO_SIZED_EXTERNAL (data, bytes, len, Qbinary); |
| 428 | 681 mem_struct.bytes = bytes; |
| 682 mem_struct.len = len; | |
| 683 mem_struct.index = 0; | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
684 unwind.giffile = DGifOpen (&mem_struct, gif_read_from_memory); |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
685 if (unwind.giffile == NULL) |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
686 signal_image_error (gif_decode_error_string (), instantiator); |
| 428 | 687 |
| 688 /* Then slurp the image into memory, decoding along the way. | |
| 689 The result is the image in a simple one-byte-per-pixel | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
690 format. */ |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
691 if (DGifSlurp (unwind.giffile) == GIF_ERROR) |
|
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
692 signal_image_error (gif_decode_error_string (), instantiator); |
| 428 | 693 } |
| 694 | |
| 695 /* 3. Now create the EImage(s) */ | |
| 696 { | |
| 697 ColorMapObject *cmo = unwind.giffile->SColorMap; | |
| 698 int i, j, row, pass, interlace, slice; | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
699 UINT_64_BIT pixels_sq; |
| 2367 | 700 Binbyte *eip; |
| 428 | 701 /* interlaced gifs have rows in this order: |
| 702 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ... */ | |
| 703 static int InterlacedOffset[] = { 0, 4, 2, 1 }; | |
| 704 static int InterlacedJumps[] = { 8, 8, 4, 2 }; | |
| 705 | |
| 706 height = unwind.giffile->SHeight; | |
| 707 width = unwind.giffile->SWidth; | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
708 pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
709 if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount)) |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
710 signal_image_error ("GIF image too large to instantiate", instantiator); |
| 2367 | 711 unwind.eimage = |
| 712 xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount); | |
| 428 | 713 if (!unwind.eimage) |
| 714 signal_image_error("Unable to allocate enough memory for image", instantiator); | |
| 715 | |
| 716 /* write the data in EImage format (8bit RGB triples) */ | |
| 717 | |
| 718 for (slice = 0; slice < unwind.giffile->ImageCount; slice++) | |
| 719 { | |
| 638 | 720 /* We check here that the current image covers the full "screen" size. */ |
| 428 | 721 if (unwind.giffile->SavedImages[slice].ImageDesc.Height != height |
| 722 || unwind.giffile->SavedImages[slice].ImageDesc.Width != width | |
| 723 || unwind.giffile->SavedImages[slice].ImageDesc.Left != 0 | |
| 724 || unwind.giffile->SavedImages[slice].ImageDesc.Top != 0) | |
| 725 signal_image_error ("Image in GIF file is not full size", | |
| 726 instantiator); | |
| 727 | |
| 728 interlace = unwind.giffile->SavedImages[slice].ImageDesc.Interlace; | |
| 729 pass = 0; | |
| 730 row = interlace ? InterlacedOffset[pass] : 0; | |
| 731 eip = unwind.eimage + (width * height * 3 * slice); | |
| 732 for (i = 0; i < height; i++) | |
| 733 { | |
| 734 if (interlace) | |
| 735 if (row >= height) { | |
| 736 row = InterlacedOffset[++pass]; | |
| 737 while (row >= height) | |
| 738 row = InterlacedOffset[++pass]; | |
| 739 } | |
| 740 eip = unwind.eimage + (width * height * 3 * slice) + (row * width * 3); | |
| 741 for (j = 0; j < width; j++) | |
| 742 { | |
| 2367 | 743 Binbyte pixel = |
| 428 | 744 unwind.giffile->SavedImages[slice].RasterBits[(i * width) + j]; |
| 745 *eip++ = cmo->Colors[pixel].Red; | |
| 746 *eip++ = cmo->Colors[pixel].Green; | |
| 747 *eip++ = cmo->Colors[pixel].Blue; | |
| 748 } | |
| 749 row += interlace ? InterlacedJumps[pass] : 1; | |
| 750 } | |
| 751 } | |
| 752 | |
| 753 /* now instantiate */ | |
| 442 | 754 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
| 428 | 755 init_image_instance_from_eimage, |
| 2959 | 756 (ii, width, height, unwind.giffile->ImageCount, |
| 757 unwind.eimage, dest_mask, instantiator, pointer_fg, | |
| 758 pointer_bg, domain)); | |
| 428 | 759 } |
| 760 | |
| 761 /* We read the gif successfully. If we have more than one slice then | |
| 762 animate the gif. */ | |
| 763 if (unwind.giffile->ImageCount > 1) | |
| 764 { | |
| 765 /* See if there is a timeout value. In theory there could be one | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
4698
diff
changeset
|
766 for every image - but that makes the implementation way too |
| 428 | 767 complicated for now so we just take the first. */ |
| 768 unsigned short timeout = 0; | |
| 769 Lisp_Object tid; | |
| 770 | |
| 771 if (unwind.giffile->SavedImages[0].Function == GRAPHICS_EXT_FUNC_CODE | |
| 772 && | |
| 773 unwind.giffile->SavedImages[0].ExtensionBlockCount) | |
| 774 { | |
| 775 timeout = (unsigned short) | |
| 438 | 776 ((unwind.giffile->SavedImages[0].ExtensionBlocks[0].Bytes[2] << 8) + |
| 428 | 777 unwind.giffile-> SavedImages[0].ExtensionBlocks[0].Bytes[1]) * 10; |
| 778 } | |
| 779 | |
| 780 /* Too short a timeout will crucify us performance-wise. */ | |
| 781 tid = add_glyph_animated_timeout (timeout > 10 ? timeout : 10, image_instance); | |
| 782 | |
| 783 if (!NILP (tid)) | |
| 784 IMAGE_INSTANCE_PIXMAP_TIMEOUT (ii) = XINT (tid); | |
| 785 } | |
| 438 | 786 |
| 771 | 787 unbind_to (speccount); |
| 428 | 788 } |
| 789 | |
| 790 #endif /* HAVE_GIF */ | |
| 791 | |
| 792 | |
| 793 #ifdef HAVE_PNG | |
| 794 | |
| 795 /********************************************************************** | |
| 796 * PNG * | |
| 797 **********************************************************************/ | |
| 798 static void | |
| 799 png_validate (Lisp_Object instantiator) | |
| 800 { | |
| 801 file_or_data_must_be_present (instantiator); | |
| 802 } | |
| 803 | |
| 804 static Lisp_Object | |
| 442 | 805 png_normalize (Lisp_Object inst, Lisp_Object console_type, |
| 2286 | 806 Lisp_Object UNUSED (dest_mask)) |
| 428 | 807 { |
| 808 return simple_image_type_normalize (inst, console_type, Qpng); | |
| 809 } | |
| 810 | |
| 811 static int | |
| 812 png_possible_dest_types (void) | |
| 813 { | |
| 814 return IMAGE_COLOR_PIXMAP_MASK; | |
| 815 } | |
| 816 | |
| 817 struct png_memory_storage | |
| 818 { | |
| 2367 | 819 const Binbyte *bytes; /* The data */ |
| 665 | 820 Bytecount len; /* How big is it? */ |
| 821 Bytecount index; /* Where are we? */ | |
| 428 | 822 }; |
| 823 | |
| 824 static void | |
| 647 | 825 png_read_from_memory (png_structp png_ptr, png_bytep data, |
| 826 png_size_t length) | |
| 428 | 827 { |
| 828 struct png_memory_storage *tbr = | |
| 829 (struct png_memory_storage *) png_get_io_ptr (png_ptr); | |
| 830 | |
| 665 | 831 if ((Bytecount) length > (tbr->len - tbr->index)) |
| 428 | 832 png_error (png_ptr, (png_const_charp) "Read Error"); |
| 647 | 833 memcpy (data, tbr->bytes + tbr->index,length); |
| 428 | 834 tbr->index = tbr->index + length; |
| 835 } | |
| 836 | |
| 837 struct png_error_struct | |
| 838 { | |
| 442 | 839 const char *err_str; |
| 428 | 840 jmp_buf setjmp_buffer; /* for return to caller */ |
| 841 }; | |
| 842 | |
| 843 /* jh 98/03/12 - #### AARRRGH! libpng includes jmp_buf inside its own | |
| 844 structure, and there are cases where the size can be different from | |
| 845 between inside the library, and inside the code! To do an end run | |
| 846 around this, use our own error functions, and don't rely on things | |
| 847 passed in the png_ptr to them. This is an ugly hack and must | |
| 848 go away when the lisp engine is threaded! */ | |
| 849 static struct png_error_struct png_err_stct; | |
| 850 | |
| 851 static void | |
| 2286 | 852 png_error_func (png_structp UNUSED (png_ptr), png_const_charp msg) |
| 428 | 853 { |
| 854 png_err_stct.err_str = msg; | |
| 855 longjmp (png_err_stct.setjmp_buffer, 1); | |
| 856 } | |
| 857 | |
| 858 static void | |
| 2286 | 859 png_warning_func (png_structp UNUSED (png_ptr), png_const_charp msg) |
| 428 | 860 { |
| 3734 | 861 DECLARE_EISTRING (eimsg); |
| 862 | |
| 863 eicpy_ext(eimsg, msg, Qbinary); | |
| 864 warn_when_safe (Qpng, Qinfo, "%s", eidata(eimsg)); | |
| 428 | 865 } |
| 866 | |
| 867 struct png_unwind_data | |
| 868 { | |
| 869 FILE *instream; | |
| 2367 | 870 Binbyte *eimage; |
| 428 | 871 png_structp png_ptr; |
| 872 png_infop info_ptr; | |
| 873 }; | |
| 874 | |
| 875 static Lisp_Object | |
| 876 png_instantiate_unwind (Lisp_Object unwind_obj) | |
| 877 { | |
| 878 struct png_unwind_data *data = | |
| 879 (struct png_unwind_data *) get_opaque_ptr (unwind_obj); | |
| 880 | |
| 881 free_opaque_ptr (unwind_obj); | |
| 882 if (data->png_ptr) | |
| 3839 | 883 { |
| 884 /* ensure we can't get here again */ | |
| 885 png_structp tmp = data->png_ptr; | |
| 886 data->png_ptr = NULL; | |
| 887 png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL); | |
| 888 } | |
| 889 | |
| 428 | 890 if (data->instream) |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
891 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
892 retry_fclose (data->instream); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
893 data->instream = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
894 } |
| 428 | 895 |
| 1726 | 896 if (data->eimage) |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
897 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
898 xfree (data->eimage); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
899 data->eimage = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
900 } |
| 428 | 901 |
| 902 return Qnil; | |
| 903 } | |
| 904 | |
| 905 static void | |
| 906 png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, | |
| 2959 | 907 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
| 428 | 908 int dest_mask, Lisp_Object domain) |
| 909 { | |
| 440 | 910 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
| 428 | 911 struct png_unwind_data unwind; |
| 912 int speccount = specpdl_depth (); | |
| 913 int height, width; | |
| 914 struct png_memory_storage tbr; /* Data to be read */ | |
| 915 | |
| 916 /* PNG variables */ | |
| 917 png_structp png_ptr; | |
| 918 png_infop info_ptr; | |
| 919 | |
| 3839 | 920 xzero (unwind); |
| 921 record_unwind_protect (png_instantiate_unwind, make_opaque_ptr (&unwind)); | |
| 922 | |
| 923 if (setjmp (png_err_stct.setjmp_buffer)) | |
| 924 { | |
| 925 /* Something blew up: | |
| 926 just display the error (cleanup happens in the unwind) */ | |
| 927 signal_image_error_2 ("Error decoding PNG", | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
928 build_extstring (png_err_stct.err_str, |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4854
diff
changeset
|
929 Qerror_message_encoding), |
| 3839 | 930 instantiator); |
| 931 } | |
| 932 | |
| 428 | 933 /* Initialize all PNG structures */ |
| 3839 | 934 png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, |
| 935 (void *) &png_err_stct, | |
| 428 | 936 png_error_func, png_warning_func); |
| 937 if (!png_ptr) | |
| 938 signal_image_error ("Error obtaining memory for png_read", instantiator); | |
| 3839 | 939 unwind.png_ptr = png_ptr; |
| 940 | |
| 428 | 941 info_ptr = png_create_info_struct (png_ptr); |
| 942 if (!info_ptr) | |
| 943 { | |
| 3839 | 944 unwind.png_ptr = NULL; /* avoid re-calling png_destroy_read_struct |
| 945 when unwinding */ | |
| 428 | 946 png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL); |
| 947 signal_image_error ("Error obtaining memory for png_read", instantiator); | |
| 948 } | |
| 949 unwind.info_ptr = info_ptr; | |
| 950 | |
| 951 /* This code is a mixture of stuff from Ben's GIF/JPEG stuff from | |
| 952 this file, example.c from the libpng 0.81 distribution, and the | |
| 953 pngtopnm sources. -WMP- | |
| 954 */ | |
| 955 /* It has been further modified to handle the API changes for 0.96, | |
| 956 and is no longer usable for previous versions. jh | |
| 957 */ | |
| 958 | |
| 959 /* Initialize the IO layer and read in header information */ | |
| 960 { | |
| 961 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | |
| 2367 | 962 const Binbyte *bytes; |
| 665 | 963 Bytecount len; |
| 428 | 964 |
| 965 assert (!NILP (data)); | |
| 966 | |
| 967 /* #### This is a definite problem under Mule due to the amount of | |
| 968 stack data it might allocate. Need to think about using Lstreams */ | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
969 LISP_STRING_TO_SIZED_EXTERNAL (data, bytes, len, Qbinary); |
| 428 | 970 tbr.bytes = bytes; |
| 971 tbr.len = len; | |
| 972 tbr.index = 0; | |
| 973 png_set_read_fn (png_ptr,(void *) &tbr, png_read_from_memory); | |
| 974 } | |
| 975 | |
| 976 png_read_info (png_ptr, info_ptr); | |
| 977 | |
| 978 { | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
979 int y, padding; |
| 2367 | 980 Binbyte **row_pointers; |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
981 UINT_64_BIT pixels_sq; |
| 428 | 982 height = info_ptr->height; |
| 983 width = info_ptr->width; | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
984 pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
985 if (pixels_sq > ((size_t) -1) / 3) |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
986 signal_image_error ("PNG image too large to instantiate", instantiator); |
| 428 | 987 |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
988 /* Wow, allocate all the memory. Truly, exciting. |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
989 Well, yes, there's excitement to be had. It turns out that libpng |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
990 strips in place, so the last row overruns the buffer if depth is 16 |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
991 or there's an alpha channel. This is a crash on Linux. So we need |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
992 to add padding. |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
993 The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */ |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
994 |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
995 padding = 5 * width; |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
996 unwind.eimage = xnew_array_and_zero (Binbyte, |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
997 (size_t) (pixels_sq * 3 + padding)); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
998 |
| 428 | 999 /* libpng expects that the image buffer passed in contains a |
| 1000 picture to draw on top of if the png has any transparencies. | |
| 1001 This could be a good place to pass that in... */ | |
| 1002 | |
| 1003 row_pointers = xnew_array (png_byte *, height); | |
| 1004 for (y = 0; y < height; y++) | |
| 1005 row_pointers[y] = unwind.eimage + (width * 3 * y); | |
| 1006 | |
| 1007 { | |
| 1008 /* if the png specifies a background chunk, go ahead and | |
| 1009 use it, else use what we can get from the default face. */ | |
| 1010 png_color_16 my_background, *image_background; | |
| 1011 Lisp_Object bkgd = Qnil; | |
| 1012 | |
| 1013 my_background.red = 0x7fff; | |
| 1014 my_background.green = 0x7fff; | |
| 1015 my_background.blue = 0x7fff; | |
| 1016 bkgd = FACE_BACKGROUND (Vdefault_face, domain); | |
| 1017 if (!COLOR_INSTANCEP (bkgd)) | |
| 1018 { | |
| 1019 warn_when_safe (Qpng, Qinfo, "Couldn't get background color!"); | |
| 1020 } | |
| 1021 else | |
| 1022 { | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1023 Lisp_Color_Instance *c = XCOLOR_INSTANCE (bkgd); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1024 Lisp_Object rgb = MAYBE_LISP_DEVMETH (XDEVICE (c->device), |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1025 color_instance_rgb_components, |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1026 (c)); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1027 #define GETCOLOR(col) my_background.col = (unsigned short) XINT (XCAR (rgb)) |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1028 GETCOLOR(red); rgb = XCDR (rgb); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1029 GETCOLOR(green); rgb = XCDR (rgb); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1030 GETCOLOR(blue); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1031 #undef GETCOLOR |
| 428 | 1032 } |
| 1033 | |
| 1034 if (png_get_bKGD (png_ptr, info_ptr, &image_background)) | |
| 1035 png_set_background (png_ptr, image_background, | |
| 1036 PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); | |
| 1037 else | |
| 1038 png_set_background (png_ptr, &my_background, | |
| 1039 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); | |
| 1040 } | |
| 1041 | |
| 1042 /* Now that we're using EImage, ask for 8bit RGB triples for any type | |
| 1043 of image*/ | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1044 /* convert palette images to RGB */ |
| 428 | 1045 if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1046 png_set_palette_to_rgb (png_ptr); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1047 /* convert grayscale images to RGB */ |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1048 else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || |
| 428 | 1049 info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 1050 png_set_gray_to_rgb (png_ptr); | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1051 /* pad images with depth < 8 bits */ |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1052 else if (info_ptr->bit_depth < 8) |
| 428 | 1053 { |
| 1054 if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) | |
| 1055 png_set_expand (png_ptr); | |
| 1056 else | |
| 1057 png_set_packing (png_ptr); | |
| 1058 } | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1059 /* strip 16-bit depth files down to 8 bits */ |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1060 if (info_ptr->bit_depth == 16) |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1061 png_set_strip_16 (png_ptr); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1062 /* strip alpha channel |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1063 #### shouldn't we handle this? |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1064 first call png_read_update_info in case above transformations |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1065 have generated an alpha channel */ |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1066 png_read_update_info(png_ptr, info_ptr); |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1067 if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1068 png_set_strip_alpha (png_ptr); |
| 428 | 1069 |
| 1070 png_read_image (png_ptr, row_pointers); | |
| 1071 png_read_end (png_ptr, info_ptr); | |
| 1072 | |
|
4698
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1073 /* #### There should be some way to pass this type of data down |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1074 * into the glyph code, where you can get to it from lisp |
|
a9493cab536f
Fix crash due to mishandling transparency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4682
diff
changeset
|
1075 * anyway. - WMP */ |
| 428 | 1076 { |
| 1077 int i; | |
| 3734 | 1078 DECLARE_EISTRING (key); |
| 1079 DECLARE_EISTRING (text); | |
| 428 | 1080 |
| 1081 for (i = 0 ; i < info_ptr->num_text ; i++) | |
| 1082 { | |
| 1083 /* How paranoid do I have to be about no trailing NULLs, and | |
| 1084 using (int)info_ptr->text[i].text_length, and strncpy and a temp | |
| 1085 string somewhere? */ | |
| 3734 | 1086 eireset(key); |
| 1087 eireset(text); | |
| 1088 eicpy_ext(key, info_ptr->text[i].key, Qbinary); | |
| 1089 eicpy_ext(text, info_ptr->text[i].text, Qbinary); | |
| 428 | 1090 |
| 1091 warn_when_safe (Qpng, Qinfo, "%s - %s", | |
| 3734 | 1092 eidata(key), eidata(text)); |
| 428 | 1093 } |
| 1094 } | |
| 1095 | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
1096 xfree (row_pointers); |
| 428 | 1097 } |
| 1098 | |
| 1099 /* now instantiate */ | |
| 442 | 1100 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
| 428 | 1101 init_image_instance_from_eimage, |
| 1102 (ii, width, height, 1, unwind.eimage, dest_mask, | |
| 2959 | 1103 instantiator, pointer_fg, pointer_bg, domain)); |
| 428 | 1104 |
| 1105 /* This will clean up everything else. */ | |
| 771 | 1106 unbind_to (speccount); |
| 428 | 1107 } |
| 1108 | |
| 1109 #endif /* HAVE_PNG */ | |
| 1110 | |
| 1111 | |
| 1112 #ifdef HAVE_TIFF | |
| 1113 #include "tiffio.h" | |
| 1114 | |
| 1115 /********************************************************************** | |
| 1116 * TIFF * | |
| 1117 **********************************************************************/ | |
| 1118 static void | |
| 1119 tiff_validate (Lisp_Object instantiator) | |
| 1120 { | |
| 1121 file_or_data_must_be_present (instantiator); | |
| 1122 } | |
| 1123 | |
| 1124 static Lisp_Object | |
| 442 | 1125 tiff_normalize (Lisp_Object inst, Lisp_Object console_type, |
| 2286 | 1126 Lisp_Object UNUSED (dest_mask)) |
| 428 | 1127 { |
| 1128 return simple_image_type_normalize (inst, console_type, Qtiff); | |
| 1129 } | |
| 1130 | |
| 1131 static int | |
| 1132 tiff_possible_dest_types (void) | |
| 1133 { | |
| 1134 return IMAGE_COLOR_PIXMAP_MASK; | |
| 1135 } | |
| 1136 | |
| 1137 struct tiff_unwind_data | |
| 1138 { | |
| 2367 | 1139 Binbyte *eimage; |
| 428 | 1140 /* Object that holds the decoded data from a TIFF file */ |
| 1141 TIFF *tiff; | |
| 1142 }; | |
| 1143 | |
| 1144 static Lisp_Object | |
| 1145 tiff_instantiate_unwind (Lisp_Object unwind_obj) | |
| 1146 { | |
| 1147 struct tiff_unwind_data *data = | |
| 1148 (struct tiff_unwind_data *) get_opaque_ptr (unwind_obj); | |
| 1149 | |
| 1150 free_opaque_ptr (unwind_obj); | |
| 1151 if (data->tiff) | |
| 1152 { | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1153 TIFFClose (data->tiff); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1154 data->tiff = 0; |
| 428 | 1155 } |
| 1156 if (data->eimage) | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1157 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1158 xfree (data->eimage); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1159 data->eimage = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5024
diff
changeset
|
1160 } |
| 428 | 1161 |
| 1162 return Qnil; | |
| 1163 } | |
| 1164 | |
| 1165 typedef struct tiff_memory_storage | |
| 1166 { | |
| 2367 | 1167 Binbyte *bytes; /* The data */ |
| 665 | 1168 Bytecount len; /* How big is it? */ |
| 1169 Bytecount index; /* Where are we? */ | |
| 428 | 1170 } tiff_memory_storage; |
| 1171 | |
| 1172 static size_t | |
| 647 | 1173 tiff_memory_read (thandle_t data, tdata_t buf, tsize_t size) |
| 428 | 1174 { |
| 647 | 1175 tiff_memory_storage *mem = (tiff_memory_storage *) data; |
| 428 | 1176 |
| 665 | 1177 if ((Bytecount) size > (mem->len - mem->index)) |
| 428 | 1178 return (size_t) -1; |
| 647 | 1179 memcpy (buf, mem->bytes + mem->index, size); |
| 428 | 1180 mem->index = mem->index + size; |
| 1181 return size; | |
| 1182 } | |
| 1183 | |
| 647 | 1184 static size_t |
| 2286 | 1185 tiff_memory_write (thandle_t UNUSED (data), tdata_t UNUSED (buf), |
| 1186 tsize_t UNUSED (size)) | |
| 428 | 1187 { |
| 2500 | 1188 ABORT(); |
| 2270 | 1189 return 0; |
| 428 | 1190 } |
| 1191 | |
| 647 | 1192 static toff_t |
| 1193 tiff_memory_seek (thandle_t data, toff_t off, int whence) | |
| 428 | 1194 { |
| 647 | 1195 tiff_memory_storage *mem = (tiff_memory_storage *) data; |
| 428 | 1196 int newidx; |
| 647 | 1197 switch(whence) |
| 1198 { | |
| 1199 case SEEK_SET: | |
| 1200 newidx = off; | |
| 1201 break; | |
| 1202 case SEEK_END: | |
| 1203 newidx = mem->len + off; | |
| 1204 break; | |
| 1205 case SEEK_CUR: | |
| 1206 newidx = mem->index + off; | |
| 1207 break; | |
| 1208 default: | |
| 1209 fprintf (stderr, "Eh? invalid seek mode in tiff_memory_seek\n"); | |
| 1210 return (toff_t) -1; | |
| 1211 } | |
| 428 | 1212 |
| 1213 if ((newidx > mem->len) || (newidx < 0)) | |
| 593 | 1214 return (toff_t) -1; |
| 428 | 1215 |
| 1216 mem->index = newidx; | |
| 1217 return newidx; | |
| 1218 } | |
| 1219 | |
| 1220 static int | |
| 2286 | 1221 tiff_memory_close (thandle_t UNUSED (data)) |
| 428 | 1222 { |
| 1223 return 0; | |
| 1224 } | |
| 1225 | |
| 1226 static int | |
| 2286 | 1227 tiff_map_noop (thandle_t UNUSED (data), tdata_t* UNUSED (pbase), |
| 1228 toff_t* UNUSED (psize)) | |
| 428 | 1229 { |
| 1230 return 0; | |
| 1231 } | |
| 1232 | |
| 1233 static void | |
| 2286 | 1234 tiff_unmap_noop (thandle_t UNUSED (data), tdata_t UNUSED (pbase), |
| 1235 toff_t UNUSED (psize)) | |
| 428 | 1236 { |
| 1237 return; | |
| 1238 } | |
| 1239 | |
| 1240 static toff_t | |
| 647 | 1241 tiff_memory_size (thandle_t data) |
| 428 | 1242 { |
| 1243 tiff_memory_storage *mem = (tiff_memory_storage*)data; | |
| 1244 return mem->len; | |
| 1245 } | |
| 1246 | |
| 1247 struct tiff_error_struct | |
| 1248 { | |
| 438 | 1249 #ifdef HAVE_VSNPRINTF |
| 428 | 1250 char err_str[256]; |
| 1251 #else | |
| 1252 char err_str[1024]; /* return the error string */ | |
| 1253 #endif | |
| 1254 jmp_buf setjmp_buffer; /* for return to caller */ | |
| 1255 }; | |
| 1256 | |
| 1257 /* jh 98/03/12 - ###This struct for passing data to the error functions | |
| 1258 is an ugly hack caused by the fact that libtiff (as of v3.4) doesn't | |
| 1259 have any place to store error func data. This should be rectified | |
| 1260 before XEmacs gets threads! */ | |
| 1261 static struct tiff_error_struct tiff_err_data; | |
| 1262 | |
| 1263 static void | |
| 2286 | 1264 tiff_error_func (const char *UNUSED (module), const char *fmt, ...) |
| 428 | 1265 { |
| 1266 va_list vargs; | |
| 1267 | |
| 1268 va_start (vargs, fmt); | |
| 438 | 1269 #ifdef HAVE_VSNPRINTF |
| 428 | 1270 vsnprintf (tiff_err_data.err_str, 255, fmt, vargs); |
| 1271 #else | |
| 1272 /* pray this doesn't overflow... */ | |
| 1273 vsprintf (tiff_err_data.err_str, fmt, vargs); | |
| 1274 #endif | |
| 1275 va_end (vargs); | |
| 1276 /* return to setjmp point */ | |
| 1277 longjmp (tiff_err_data.setjmp_buffer, 1); | |
| 1278 } | |
| 1279 | |
| 1280 static void | |
| 647 | 1281 tiff_warning_func (const char *module, const char *fmt, ...) |
| 428 | 1282 { |
| 1283 va_list vargs; | |
| 438 | 1284 #ifdef HAVE_VSNPRINTF |
| 428 | 1285 char warn_str[256]; |
| 1286 #else | |
| 1287 char warn_str[1024]; | |
| 1288 #endif | |
| 3734 | 1289 DECLARE_EISTRING (eimodule); |
| 1290 DECLARE_EISTRING (eiwarnstr); | |
| 428 | 1291 |
| 1292 va_start (vargs, fmt); | |
| 438 | 1293 #ifdef HAVE_VSNPRINTF |
| 428 | 1294 vsnprintf (warn_str, 255, fmt, vargs); |
| 1295 #else | |
| 1296 vsprintf (warn_str, fmt, vargs); | |
| 1297 #endif | |
| 1298 va_end (vargs); | |
| 3734 | 1299 |
| 1300 eicpy_ext(eimodule, module, Qbinary); | |
| 1301 eicpy_ext(eiwarnstr, warn_str, Qbinary); | |
| 1302 | |
| 428 | 1303 warn_when_safe (Qtiff, Qinfo, "%s - %s", |
| 3734 | 1304 eidata(eimodule), |
| 1305 eidata(eiwarnstr)); | |
| 428 | 1306 } |
| 1307 | |
| 1308 static void | |
| 1309 tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, | |
| 2959 | 1310 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
| 428 | 1311 int dest_mask, Lisp_Object domain) |
| 1312 { | |
| 440 | 1313 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
| 428 | 1314 tiff_memory_storage mem_struct; |
| 1315 /* It is OK for the unwind data to be local to this function, | |
| 1316 because the unwind-protect is always executed when this | |
| 1317 stack frame is still valid. */ | |
| 1318 struct tiff_unwind_data unwind; | |
| 1319 int speccount = specpdl_depth (); | |
| 1320 uint32 width, height; | |
| 1321 | |
| 1322 xzero (unwind); | |
| 1323 record_unwind_protect (tiff_instantiate_unwind, make_opaque_ptr (&unwind)); | |
| 1324 | |
| 1325 /* set up error facilities */ | |
| 1326 if (setjmp (tiff_err_data.setjmp_buffer)) | |
| 1327 { | |
| 1328 /* An error was signaled. No clean up is needed, as unwind handles that | |
| 1329 for us. Just pass the error along. */ | |
| 1330 signal_image_error_2 ("TIFF decoding error", | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
1331 build_extstring (tiff_err_data.err_str, |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4854
diff
changeset
|
1332 Qerror_message_encoding), |
| 428 | 1333 instantiator); |
| 1334 } | |
| 1335 TIFFSetErrorHandler ((TIFFErrorHandler)tiff_error_func); | |
| 1336 TIFFSetWarningHandler ((TIFFErrorHandler)tiff_warning_func); | |
| 1337 { | |
| 1338 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | |
| 2367 | 1339 Binbyte *bytes; |
| 665 | 1340 Bytecount len; |
| 428 | 1341 |
| 1342 uint32 *raster; | |
| 2367 | 1343 Binbyte *ep; |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
1344 UINT_64_BIT pixels_sq; |
| 428 | 1345 |
| 1346 assert (!NILP (data)); | |
| 1347 | |
| 1348 /* #### This is a definite problem under Mule due to the amount of | |
| 1349 stack data it might allocate. Think about Lstreams... */ | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
1350 LISP_STRING_TO_SIZED_EXTERNAL (data, bytes, len, Qbinary); |
| 428 | 1351 mem_struct.bytes = bytes; |
| 1352 mem_struct.len = len; | |
| 1353 mem_struct.index = 0; | |
| 1354 | |
| 442 | 1355 unwind.tiff = TIFFClientOpen ("memfile", "r", (thandle_t) &mem_struct, |
| 428 | 1356 (TIFFReadWriteProc)tiff_memory_read, |
| 1357 (TIFFReadWriteProc)tiff_memory_write, | |
| 1358 tiff_memory_seek, tiff_memory_close, tiff_memory_size, | |
| 1359 tiff_map_noop, tiff_unmap_noop); | |
| 1360 if (!unwind.tiff) | |
| 440 | 1361 signal_image_error ("Insufficient memory to instantiate TIFF image", instantiator); |
| 428 | 1362 |
| 1363 TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width); | |
| 1364 TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height); | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
1365 pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
1366 if (pixels_sq >= 1 << 29) |
|
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
1367 signal_image_error ("TIFF image too large to instantiate", instantiator); |
|
4682
648f4a0dac3e
Fix build problems on WIN32 platforms caused by the large image crash fix.
Jerry James <james@xemacs.org>
parents:
4646
diff
changeset
|
1368 unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3); |
| 428 | 1369 |
| 440 | 1370 /* #### This is little more than proof-of-concept/function testing. |
| 428 | 1371 It needs to be reimplemented via scanline reads for both memory |
| 1372 compactness. */ | |
|
4646
6c6bfdb80a0c
Prevent integer overflow and subsequent crashes when attempting to load large
Jerry James <james@xemacs.org>
parents:
4326
diff
changeset
|
1373 raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32))); |
| 428 | 1374 if (raster != NULL) |
| 1375 { | |
| 647 | 1376 int i, j; |
| 428 | 1377 uint32 *rp; |
| 1378 ep = unwind.eimage; | |
| 1379 rp = raster; | |
| 1380 if (TIFFReadRGBAImage (unwind.tiff, width, height, raster, 0)) | |
| 1381 { | |
| 1382 for (i = height - 1; i >= 0; i--) | |
| 1383 { | |
| 1384 /* This is to get around weirdness in the libtiff library where properly | |
| 1385 made TIFFs will come out upside down. libtiff bug or jhod-brainlock? */ | |
| 1386 rp = raster + (i * width); | |
| 647 | 1387 for (j = 0; j < (int) width; j++) |
| 428 | 1388 { |
| 2367 | 1389 *ep++ = (Binbyte)TIFFGetR(*rp); |
| 1390 *ep++ = (Binbyte)TIFFGetG(*rp); | |
| 1391 *ep++ = (Binbyte)TIFFGetB(*rp); | |
| 428 | 1392 rp++; |
| 1393 } | |
| 1394 } | |
| 1395 } | |
| 1396 _TIFFfree (raster); | |
| 1397 } else | |
| 1398 signal_image_error ("Unable to allocate memory for TIFFReadRGBA", instantiator); | |
| 1399 | |
| 1400 } | |
| 1401 | |
| 1402 /* now instantiate */ | |
| 442 | 1403 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
| 428 | 1404 init_image_instance_from_eimage, |
| 1405 (ii, width, height, 1, unwind.eimage, dest_mask, | |
| 2959 | 1406 instantiator, pointer_fg, pointer_bg, domain)); |
| 428 | 1407 |
| 771 | 1408 unbind_to (speccount); |
| 428 | 1409 } |
| 1410 | |
| 1411 #endif /* HAVE_TIFF */ | |
| 1412 | |
| 1413 | |
| 1414 /************************************************************************/ | |
| 1415 /* initialization */ | |
| 1416 /************************************************************************/ | |
| 1417 | |
| 1418 void | |
| 1419 syms_of_glyphs_eimage (void) | |
| 1420 { | |
| 1421 } | |
| 1422 | |
| 1423 void | |
| 1424 image_instantiator_format_create_glyphs_eimage (void) | |
| 1425 { | |
| 1426 /* image-instantiator types */ | |
| 1427 #ifdef HAVE_JPEG | |
| 1428 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (jpeg, "jpeg"); | |
| 1429 | |
| 1430 IIFORMAT_HAS_METHOD (jpeg, validate); | |
| 1431 IIFORMAT_HAS_METHOD (jpeg, normalize); | |
| 1432 IIFORMAT_HAS_METHOD (jpeg, possible_dest_types); | |
| 1433 IIFORMAT_HAS_METHOD (jpeg, instantiate); | |
| 1434 | |
| 1435 IIFORMAT_VALID_KEYWORD (jpeg, Q_data, check_valid_string); | |
| 1436 IIFORMAT_VALID_KEYWORD (jpeg, Q_file, check_valid_string); | |
| 1437 #endif | |
| 1438 | |
| 1439 #ifdef HAVE_GIF | |
| 1440 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (gif, "gif"); | |
| 1441 | |
| 1442 IIFORMAT_HAS_METHOD (gif, validate); | |
| 1443 IIFORMAT_HAS_METHOD (gif, normalize); | |
| 1444 IIFORMAT_HAS_METHOD (gif, possible_dest_types); | |
| 1445 IIFORMAT_HAS_METHOD (gif, instantiate); | |
| 1446 | |
| 1447 IIFORMAT_VALID_KEYWORD (gif, Q_data, check_valid_string); | |
| 1448 IIFORMAT_VALID_KEYWORD (gif, Q_file, check_valid_string); | |
| 1449 #endif | |
| 1450 | |
| 1451 #ifdef HAVE_PNG | |
| 1452 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (png, "png"); | |
| 1453 | |
| 1454 IIFORMAT_HAS_METHOD (png, validate); | |
| 1455 IIFORMAT_HAS_METHOD (png, normalize); | |
| 1456 IIFORMAT_HAS_METHOD (png, possible_dest_types); | |
| 1457 IIFORMAT_HAS_METHOD (png, instantiate); | |
| 1458 | |
| 1459 IIFORMAT_VALID_KEYWORD (png, Q_data, check_valid_string); | |
| 1460 IIFORMAT_VALID_KEYWORD (png, Q_file, check_valid_string); | |
| 1461 #endif | |
| 1462 | |
| 1463 #ifdef HAVE_TIFF | |
| 1464 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (tiff, "tiff"); | |
| 1465 | |
| 1466 IIFORMAT_HAS_METHOD (tiff, validate); | |
| 1467 IIFORMAT_HAS_METHOD (tiff, normalize); | |
| 1468 IIFORMAT_HAS_METHOD (tiff, possible_dest_types); | |
| 1469 IIFORMAT_HAS_METHOD (tiff, instantiate); | |
| 1470 | |
| 1471 IIFORMAT_VALID_KEYWORD (tiff, Q_data, check_valid_string); | |
| 1472 IIFORMAT_VALID_KEYWORD (tiff, Q_file, check_valid_string); | |
| 1473 #endif | |
| 1474 | |
| 1475 } | |
| 1476 | |
| 1477 void | |
| 1478 vars_of_glyphs_eimage (void) | |
| 1479 { | |
| 1480 #ifdef HAVE_JPEG | |
| 1481 Fprovide (Qjpeg); | |
| 1482 #endif | |
| 1483 | |
| 1484 #ifdef HAVE_GIF | |
| 1485 Fprovide (Qgif); | |
| 1486 #endif | |
| 1487 | |
| 1488 #ifdef HAVE_PNG | |
| 1489 Fprovide (Qpng); | |
| 1490 #endif | |
| 1491 | |
| 1492 #ifdef HAVE_TIFF | |
| 1493 Fprovide (Qtiff); | |
| 1494 #endif | |
| 1495 | |
| 1496 } |