comparison src/glyphs-eimage.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children 3d8143fc88e1
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* EImage-specific Lisp objects. 1 /* EImage-specific Lisp objects.
2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems 4 Copyright (C) 1995 Tinker Systems
5 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing 5 Copyright (C) 1995, 1996, 2001, 2002, 2004 Ben Wing
6 Copyright (C) 1995 Sun Microsystems 6 Copyright (C) 1995 Sun Microsystems
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
10 XEmacs is free software; you can redistribute it and/or modify it 10 XEmacs is free software; you can redistribute it and/or modify it
138 /* Stream that we need to close */ 138 /* Stream that we need to close */
139 FILE *instream; 139 FILE *instream;
140 /* Object that holds state info for JPEG decoding */ 140 /* Object that holds state info for JPEG decoding */
141 struct jpeg_decompress_struct *cinfo_ptr; 141 struct jpeg_decompress_struct *cinfo_ptr;
142 /* EImage data */ 142 /* EImage data */
143 UChar_Binary *eimage; 143 Binbyte *eimage;
144 }; 144 };
145 145
146 static Lisp_Object 146 static Lisp_Object
147 jpeg_instantiate_unwind (Lisp_Object unwind_obj) 147 jpeg_instantiate_unwind (Lisp_Object unwind_obj)
148 { 148 {
155 155
156 if (data->instream) 156 if (data->instream)
157 retry_fclose (data->instream); 157 retry_fclose (data->instream);
158 158
159 if (data->eimage) 159 if (data->eimage)
160 xfree (data->eimage, UChar_Binary *); 160 xfree (data->eimage, Binbyte *);
161 161
162 return Qnil; 162 return Qnil;
163 } 163 }
164 164
165 /* 165 /*
373 373
374 /* Step 2: specify data source (eg, a file) */ 374 /* Step 2: specify data source (eg, a file) */
375 375
376 { 376 {
377 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 377 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
378 const UChar_Binary *bytes; 378 const Binbyte *bytes;
379 Bytecount len; 379 Bytecount len;
380 380
381 /* #### This is a definite problem under Mule due to the amount of 381 /* #### This is a definite problem under Mule due to the amount of
382 stack data it might allocate. Need to be able to convert and 382 stack data it might allocate. Need to be able to convert and
383 write out to a file. */ 383 write out to a file. */
416 /* Step 5: Start decompressor */ 416 /* Step 5: Start decompressor */
417 jpeg_start_decompress (&cinfo); 417 jpeg_start_decompress (&cinfo);
418 418
419 /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/ 419 /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
420 420
421 unwind.eimage = (UChar_Binary*) xmalloc (cinfo.output_width * cinfo.output_height * 3); 421 unwind.eimage =
422 xnew_binbytes (cinfo.output_width * cinfo.output_height * 3);
422 if (!unwind.eimage) 423 if (!unwind.eimage)
423 signal_image_error("Unable to allocate enough memory for image", instantiator); 424 signal_image_error("Unable to allocate enough memory for image", instantiator);
424 425
425 { 426 {
426 JSAMPARRAY row_buffer; /* Output row buffer */ 427 JSAMPARRAY row_buffer; /* Output row buffer */
427 JSAMPLE *jp; 428 JSAMPLE *jp;
428 int row_stride; /* physical row width in output buffer */ 429 int row_stride; /* physical row width in output buffer */
429 UChar_Binary *op = unwind.eimage; 430 Binbyte *op = unwind.eimage;
430 431
431 /* We may need to do some setup of our own at this point before reading 432 /* We may need to do some setup of our own at this point before reading
432 * the data. After jpeg_start_decompress() we have the correct scaled 433 * the data. After jpeg_start_decompress() we have the correct scaled
433 * output image dimensions available 434 * output image dimensions available
434 * We need to make an output work buffer of the right size. 435 * We need to make an output work buffer of the right size.
456 for (i = 0; i < (int) cinfo.output_width; i++) 457 for (i = 0; i < (int) cinfo.output_width; i++)
457 { 458 {
458 int clr; 459 int clr;
459 if (jpeg_gray) 460 if (jpeg_gray)
460 { 461 {
461 UChar_Binary val; 462 Binbyte val;
462 #if (BITS_IN_JSAMPLE == 8) 463 #if (BITS_IN_JSAMPLE == 8)
463 val = (UChar_Binary) *jp++; 464 val = (Binbyte) *jp++;
464 #else /* other option is 12 */ 465 #else /* other option is 12 */
465 val = (UChar_Binary) (*jp++ >> 4); 466 val = (Binbyte) (*jp++ >> 4);
466 #endif 467 #endif
467 for (clr = 0; clr < 3; clr++) /* copy the same value into RGB */ 468 for (clr = 0; clr < 3; clr++) /* copy the same value into RGB */
468 *op++ = val; 469 *op++ = val;
469 } 470 }
470 else 471 else
471 { 472 {
472 for (clr = 0; clr < 3; clr++) 473 for (clr = 0; clr < 3; clr++)
473 #if (BITS_IN_JSAMPLE == 8) 474 #if (BITS_IN_JSAMPLE == 8)
474 *op++ = (UChar_Binary)*jp++; 475 *op++ = (Binbyte)*jp++;
475 #else /* other option is 12 */ 476 #else /* other option is 12 */
476 *op++ = (UChar_Binary)(*jp++ >> 4); 477 *op++ = (Binbyte)(*jp++ >> 4);
477 #endif 478 #endif
478 } 479 }
479 } 480 }
480 } 481 }
481 } 482 }
533 everything gets cleaned up in the presence of an error, we 534 everything gets cleaned up in the presence of an error, we
534 use an unwind_protect(). */ 535 use an unwind_protect(). */
535 536
536 struct gif_unwind_data 537 struct gif_unwind_data
537 { 538 {
538 UChar_Binary *eimage; 539 Binbyte *eimage;
539 /* Object that holds the decoded data from a GIF file */ 540 /* Object that holds the decoded data from a GIF file */
540 GifFileType *giffile; 541 GifFileType *giffile;
541 }; 542 };
542 543
543 static Lisp_Object 544 static Lisp_Object
551 { 552 {
552 DGifCloseFile (data->giffile); 553 DGifCloseFile (data->giffile);
553 GifFree(data->giffile); 554 GifFree(data->giffile);
554 } 555 }
555 if (data->eimage) 556 if (data->eimage)
556 xfree (data->eimage, UChar_Binary *); 557 xfree (data->eimage, Binbyte *);
557 558
558 return Qnil; 559 return Qnil;
559 } 560 }
560 561
561 typedef struct gif_memory_storage 562 typedef struct gif_memory_storage
562 { 563 {
563 UChar_Binary *bytes; /* The data */ 564 Binbyte *bytes; /* The data */
564 Bytecount len; /* How big is it? */ 565 Bytecount len; /* How big is it? */
565 Bytecount index; /* Where are we? */ 566 Bytecount index; /* Where are we? */
566 } gif_memory_storage; 567 } gif_memory_storage;
567 568
568 static Bytecount 569 static Bytecount
611 stack frame is still valid. */ 612 stack frame is still valid. */
612 struct gif_unwind_data unwind; 613 struct gif_unwind_data unwind;
613 int speccount = specpdl_depth (); 614 int speccount = specpdl_depth ();
614 gif_memory_storage mem_struct; 615 gif_memory_storage mem_struct;
615 struct gif_error_struct gif_err; 616 struct gif_error_struct gif_err;
616 UChar_Binary *bytes; 617 Binbyte *bytes;
617 Bytecount len; 618 Bytecount len;
618 int height = 0; 619 int height = 0;
619 int width = 0; 620 int width = 0;
620 621
621 xzero (unwind); 622 xzero (unwind);
661 662
662 /* 3. Now create the EImage(s) */ 663 /* 3. Now create the EImage(s) */
663 { 664 {
664 ColorMapObject *cmo = unwind.giffile->SColorMap; 665 ColorMapObject *cmo = unwind.giffile->SColorMap;
665 int i, j, row, pass, interlace, slice; 666 int i, j, row, pass, interlace, slice;
666 UChar_Binary *eip; 667 Binbyte *eip;
667 /* interlaced gifs have rows in this order: 668 /* interlaced gifs have rows in this order:
668 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ... */ 669 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ... */
669 static int InterlacedOffset[] = { 0, 4, 2, 1 }; 670 static int InterlacedOffset[] = { 0, 4, 2, 1 };
670 static int InterlacedJumps[] = { 8, 8, 4, 2 }; 671 static int InterlacedJumps[] = { 8, 8, 4, 2 };
671 672
672 height = unwind.giffile->SHeight; 673 height = unwind.giffile->SHeight;
673 width = unwind.giffile->SWidth; 674 width = unwind.giffile->SWidth;
674 unwind.eimage = (UChar_Binary*) 675 unwind.eimage =
675 xmalloc (width * height * 3 * unwind.giffile->ImageCount); 676 xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount);
676 if (!unwind.eimage) 677 if (!unwind.eimage)
677 signal_image_error("Unable to allocate enough memory for image", instantiator); 678 signal_image_error("Unable to allocate enough memory for image", instantiator);
678 679
679 /* write the data in EImage format (8bit RGB triples) */ 680 /* write the data in EImage format (8bit RGB triples) */
680 681
701 row = InterlacedOffset[++pass]; 702 row = InterlacedOffset[++pass];
702 } 703 }
703 eip = unwind.eimage + (width * height * 3 * slice) + (row * width * 3); 704 eip = unwind.eimage + (width * height * 3 * slice) + (row * width * 3);
704 for (j = 0; j < width; j++) 705 for (j = 0; j < width; j++)
705 { 706 {
706 UChar_Binary pixel = 707 Binbyte pixel =
707 unwind.giffile->SavedImages[slice].RasterBits[(i * width) + j]; 708 unwind.giffile->SavedImages[slice].RasterBits[(i * width) + j];
708 *eip++ = cmo->Colors[pixel].Red; 709 *eip++ = cmo->Colors[pixel].Red;
709 *eip++ = cmo->Colors[pixel].Green; 710 *eip++ = cmo->Colors[pixel].Green;
710 *eip++ = cmo->Colors[pixel].Blue; 711 *eip++ = cmo->Colors[pixel].Blue;
711 } 712 }
776 return IMAGE_COLOR_PIXMAP_MASK; 777 return IMAGE_COLOR_PIXMAP_MASK;
777 } 778 }
778 779
779 struct png_memory_storage 780 struct png_memory_storage
780 { 781 {
781 const UChar_Binary *bytes; /* The data */ 782 const Binbyte *bytes; /* The data */
782 Bytecount len; /* How big is it? */ 783 Bytecount len; /* How big is it? */
783 Bytecount index; /* Where are we? */ 784 Bytecount index; /* Where are we? */
784 }; 785 };
785 786
786 static void 787 static void
824 } 825 }
825 826
826 struct png_unwind_data 827 struct png_unwind_data
827 { 828 {
828 FILE *instream; 829 FILE *instream;
829 UChar_Binary *eimage; 830 Binbyte *eimage;
830 png_structp png_ptr; 831 png_structp png_ptr;
831 png_infop info_ptr; 832 png_infop info_ptr;
832 }; 833 };
833 834
834 static Lisp_Object 835 static Lisp_Object
842 png_destroy_read_struct (&(data->png_ptr), &(data->info_ptr), (png_infopp)NULL); 843 png_destroy_read_struct (&(data->png_ptr), &(data->info_ptr), (png_infopp)NULL);
843 if (data->instream) 844 if (data->instream)
844 retry_fclose (data->instream); 845 retry_fclose (data->instream);
845 846
846 if (data->eimage) 847 if (data->eimage)
847 xfree(data->eimage, UChar_Binary *); 848 xfree(data->eimage, Binbyte *);
848 849
849 return Qnil; 850 return Qnil;
850 } 851 }
851 852
852 static void 853 static void
902 } 903 }
903 904
904 /* Initialize the IO layer and read in header information */ 905 /* Initialize the IO layer and read in header information */
905 { 906 {
906 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 907 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
907 const UChar_Binary *bytes; 908 const Binbyte *bytes;
908 Bytecount len; 909 Bytecount len;
909 910
910 assert (!NILP (data)); 911 assert (!NILP (data));
911 912
912 /* #### This is a definite problem under Mule due to the amount of 913 /* #### This is a definite problem under Mule due to the amount of
920 921
921 png_read_info (png_ptr, info_ptr); 922 png_read_info (png_ptr, info_ptr);
922 923
923 { 924 {
924 int y; 925 int y;
925 UChar_Binary **row_pointers; 926 Binbyte **row_pointers;
926 height = info_ptr->height; 927 height = info_ptr->height;
927 width = info_ptr->width; 928 width = info_ptr->width;
928 929
929 /* Wow, allocate all the memory. Truly, exciting. */ 930 /* Wow, allocate all the memory. Truly, exciting. */
930 unwind.eimage = xnew_array_and_zero (UChar_Binary, width * height * 3); 931 unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3);
931 /* libpng expects that the image buffer passed in contains a 932 /* libpng expects that the image buffer passed in contains a
932 picture to draw on top of if the png has any transparencies. 933 picture to draw on top of if the png has any transparencies.
933 This could be a good place to pass that in... */ 934 This could be a good place to pass that in... */
934 935
935 row_pointers = xnew_array (png_byte *, height); 936 row_pointers = xnew_array (png_byte *, height);
1024 info_ptr->text[i].text); 1025 info_ptr->text[i].text);
1025 } 1026 }
1026 } 1027 }
1027 #endif 1028 #endif
1028 1029
1029 xfree (row_pointers, UChar_Binary **); 1030 xfree (row_pointers, Binbyte **);
1030 } 1031 }
1031 1032
1032 /* now instantiate */ 1033 /* now instantiate */
1033 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), 1034 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
1034 init_image_instance_from_eimage, 1035 init_image_instance_from_eimage,
1067 return IMAGE_COLOR_PIXMAP_MASK; 1068 return IMAGE_COLOR_PIXMAP_MASK;
1068 } 1069 }
1069 1070
1070 struct tiff_unwind_data 1071 struct tiff_unwind_data
1071 { 1072 {
1072 UChar_Binary *eimage; 1073 Binbyte *eimage;
1073 /* Object that holds the decoded data from a TIFF file */ 1074 /* Object that holds the decoded data from a TIFF file */
1074 TIFF *tiff; 1075 TIFF *tiff;
1075 }; 1076 };
1076 1077
1077 static Lisp_Object 1078 static Lisp_Object
1084 if (data->tiff) 1085 if (data->tiff)
1085 { 1086 {
1086 TIFFClose(data->tiff); 1087 TIFFClose(data->tiff);
1087 } 1088 }
1088 if (data->eimage) 1089 if (data->eimage)
1089 xfree (data->eimage, UChar_Binary *); 1090 xfree (data->eimage, Binbyte *);
1090 1091
1091 return Qnil; 1092 return Qnil;
1092 } 1093 }
1093 1094
1094 typedef struct tiff_memory_storage 1095 typedef struct tiff_memory_storage
1095 { 1096 {
1096 UChar_Binary *bytes; /* The data */ 1097 Binbyte *bytes; /* The data */
1097 Bytecount len; /* How big is it? */ 1098 Bytecount len; /* How big is it? */
1098 Bytecount index; /* Where are we? */ 1099 Bytecount index; /* Where are we? */
1099 } tiff_memory_storage; 1100 } tiff_memory_storage;
1100 1101
1101 static size_t 1102 static size_t
1256 } 1257 }
1257 TIFFSetErrorHandler ((TIFFErrorHandler)tiff_error_func); 1258 TIFFSetErrorHandler ((TIFFErrorHandler)tiff_error_func);
1258 TIFFSetWarningHandler ((TIFFErrorHandler)tiff_warning_func); 1259 TIFFSetWarningHandler ((TIFFErrorHandler)tiff_warning_func);
1259 { 1260 {
1260 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1261 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1261 UChar_Binary *bytes; 1262 Binbyte *bytes;
1262 Bytecount len; 1263 Bytecount len;
1263 1264
1264 uint32 *raster; 1265 uint32 *raster;
1265 UChar_Binary *ep; 1266 Binbyte *ep;
1266 1267
1267 assert (!NILP (data)); 1268 assert (!NILP (data));
1268 1269
1269 /* #### This is a definite problem under Mule due to the amount of 1270 /* #### This is a definite problem under Mule due to the amount of
1270 stack data it might allocate. Think about Lstreams... */ 1271 stack data it might allocate. Think about Lstreams... */
1283 if (!unwind.tiff) 1284 if (!unwind.tiff)
1284 signal_image_error ("Insufficient memory to instantiate TIFF image", instantiator); 1285 signal_image_error ("Insufficient memory to instantiate TIFF image", instantiator);
1285 1286
1286 TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width); 1287 TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
1287 TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height); 1288 TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
1288 unwind.eimage = (UChar_Binary *) xmalloc (width * height * 3); 1289 unwind.eimage = xnew_binbytes (width * height * 3);
1289 1290
1290 /* #### This is little more than proof-of-concept/function testing. 1291 /* #### This is little more than proof-of-concept/function testing.
1291 It needs to be reimplemented via scanline reads for both memory 1292 It needs to be reimplemented via scanline reads for both memory
1292 compactness. */ 1293 compactness. */
1293 raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32)); 1294 raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
1304 /* This is to get around weirdness in the libtiff library where properly 1305 /* This is to get around weirdness in the libtiff library where properly
1305 made TIFFs will come out upside down. libtiff bug or jhod-brainlock? */ 1306 made TIFFs will come out upside down. libtiff bug or jhod-brainlock? */
1306 rp = raster + (i * width); 1307 rp = raster + (i * width);
1307 for (j = 0; j < (int) width; j++) 1308 for (j = 0; j < (int) width; j++)
1308 { 1309 {
1309 *ep++ = (UChar_Binary)TIFFGetR(*rp); 1310 *ep++ = (Binbyte)TIFFGetR(*rp);
1310 *ep++ = (UChar_Binary)TIFFGetG(*rp); 1311 *ep++ = (Binbyte)TIFFGetG(*rp);
1311 *ep++ = (UChar_Binary)TIFFGetB(*rp); 1312 *ep++ = (Binbyte)TIFFGetB(*rp);
1312 rp++; 1313 rp++;
1313 } 1314 }
1314 } 1315 }
1315 } 1316 }
1316 _TIFFfree (raster); 1317 _TIFFfree (raster);