xemacs-beta: src/glyphs-eimage.c comparison

comparison src/glyphs-eimage.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29

author	cvs
date	Mon, 13 Aug 2007 11:13:30 +0200
parents	aabb7f5b1c81
children	2f8bb876ab1d

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 static void
 jpeg_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		  Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		  int dest_mask, Lisp_Object domain)
 {
-struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 /* It is OK for the unwind data to be local to this function,
 because the unwind-protect is always executed when this
 stack frame is still valid. */
 struct jpeg_unwind_data unwind;
 int speccount = specpdl_depth ();
 /* Step 2: specify data source (eg, a file) */
 {
 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
-CONST Extbyte *bytes;
+const Extbyte *bytes;
 Extcount len;
 /* #### This is a definite problem under Mule due to the amount of
 stack data it might allocate.  Need to be able to convert and
 write out to a file. */
-GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
 jpeg_memory_src (&cinfo, (JOCTET *) bytes, len);
 }
 /* Step 3: read file parameters with jpeg_read_header() */
 /* Step 6.5: Create the pixmap and set up the image instance */
 /* now instantiate */
 MAYBE_DEVMETH (XDEVICE (ii->device),
 		 init_image_instance_from_eimage,
-		 (ii, cinfo.output_width, cinfo.output_height,
+		 (ii, cinfo.output_width, cinfo.output_height, 1,
 		  unwind.eimage, dest_mask,
 		  instantiator, domain));
 /* Step 7: Finish decompression */
 return 0;
 }
 struct gif_error_struct
 {
-CONST char *err_str;		/* return the error string */
+const char *err_str;		/* return the error string */
 jmp_buf setjmp_buffer;	/* for return to caller */
 };
 static void
-gif_error_func(CONST char *err_str, VoidPtr error_ptr)
+gif_error_func(const char *err_str, VoidPtr error_ptr)
 {
 struct gif_error_struct *error_data = (struct gif_error_struct*)error_ptr;
 /* return to setjmp point */
 error_data->err_str = err_str;
 static void
 gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		 int dest_mask, Lisp_Object domain)
 {
-struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 /* It is OK for the unwind data to be local to this function,
 because the unwind-protect is always executed when this
 stack frame is still valid. */
 struct gif_unwind_data unwind;
 int speccount = specpdl_depth ();
 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
 assert (!NILP (data));
 if (!(unwind.giffile = GifSetup()))
-signal_image_error ("Insufficent memory to instantiate GIF image", instantiator);
+signal_image_error ("Insufficient memory to instantiate GIF image", instantiator);
 /* set up error facilities */
 if (setjmp(gif_err.setjmp_buffer))
 {
 	/* An error was signaled. No clean up is needed, as unwind handles that
 	errstring = build_string (gif_err.err_str);
 	signal_image_error_2 ("GIF decoding error", errstring, instantiator);
 }
 GifSetErrorFunc(unwind.giffile, (Gif_error_func)gif_error_func, (VoidPtr)&gif_err);
-GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
 mem_struct.bytes = bytes;
 mem_struct.len = len;
 mem_struct.index = 0;
 GifSetReadFunc(unwind.giffile, gif_read_from_memory, (VoidPtr)&mem_struct);
 GifSetCloseFunc(unwind.giffile, gif_memory_close, (VoidPtr)&mem_struct);
 format (#### the GIF routines only support 8-bit GIFs,
 it appears). */
 DGifSlurp (unwind.giffile);
 }
-/* 3. Now create the EImage */
+/* 3. Now create the EImage(s) */
 {
 ColorMapObject *cmo = unwind.giffile->SColorMap;
-int i, j, row, pass, interlace;
+int i, j, row, pass, interlace, slice;
 unsigned char *eip;
 /* interlaced gifs have rows in this order:
 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
 static int InterlacedOffset[] = { 0, 4, 2, 1 };
 static int InterlacedJumps[] = { 8, 8, 4, 2 };
 height = unwind.giffile->SHeight;
 width = unwind.giffile->SWidth;
-unwind.eimage = (unsigned char*) xmalloc (width * height * 3);
+unwind.eimage = (unsigned char*)
+xmalloc (width * height * 3 * unwind.giffile->ImageCount);
 if (!unwind.eimage)
 signal_image_error("Unable to allocate enough memory for image", instantiator);
 /* write the data in EImage format (8bit RGB triples) */
-/* Note: We just use the first image in the file and ignore the rest.
+for (slice = 0; slice < unwind.giffile->ImageCount; slice++)
-We check here that that image covers the full "screen" size.
-I don't know whether that's always the case.
--dkindred@cs.cmu.edu  */
-if (unwind.giffile->SavedImages[0].ImageDesc.Height != height
-	|| unwind.giffile->SavedImages[0].ImageDesc.Width != width
-	|| unwind.giffile->SavedImages[0].ImageDesc.Left != 0
-	|| unwind.giffile->SavedImages[0].ImageDesc.Top != 0)
-signal_image_error ("First image in GIF file is not full size",
-			  instantiator);
-interlace = unwind.giffile->SavedImages[0].ImageDesc.Interlace;
-pass = 0;
-row = interlace ? InterlacedOffset[pass] : 0;
-eip = unwind.eimage;
-for (i = 0; i < height; i++)
 {
-	if (interlace)
+	/* We check here that that the current image covers the full "screen" size. */
-	  if (row >= height) {
+	if (unwind.giffile->SavedImages[slice].ImageDesc.Height != height
-	    row = InterlacedOffset[++pass];
+	    || unwind.giffile->SavedImages[slice].ImageDesc.Width != width
-	    while (row >= height)
+	    || unwind.giffile->SavedImages[slice].ImageDesc.Left != 0
-	      row = InterlacedOffset[++pass];
+	    || unwind.giffile->SavedImages[slice].ImageDesc.Top != 0)
+	  signal_image_error ("Image in GIF file is not full size",
+			      instantiator);
+	interlace = unwind.giffile->SavedImages[slice].ImageDesc.Interlace;
+	pass = 0;
+	row = interlace ? InterlacedOffset[pass] : 0;
+	eip = unwind.eimage + (width * height * 3 * slice);
+	for (i = 0; i < height; i++)
+	  {
+	    if (interlace)
+	      if (row >= height) {
+		row = InterlacedOffset[++pass];
+		while (row >= height)
+		  row = InterlacedOffset[++pass];
+	      }
+	    eip = unwind.eimage + (width * height * 3 * slice) + (row * width * 3);
+	    for (j = 0; j < width; j++)
+	      {
+		unsigned char pixel =
+		  unwind.giffile->SavedImages[slice].RasterBits[(i * width) + j];
+		*eip++ = cmo->Colors[pixel].Red;
+		*eip++ = cmo->Colors[pixel].Green;
+		*eip++ = cmo->Colors[pixel].Blue;
+	      }
+	    row += interlace ? InterlacedJumps[pass] : 1;
 	  }
-	eip = unwind.eimage + (row * width * 3);
-	for (j = 0; j < width; j++)
-	  {
-	    unsigned char pixel = unwind.giffile->SavedImages[0].RasterBits[(i * width) + j];
-	    *eip++ = cmo->Colors[pixel].Red;
-	    *eip++ = cmo->Colors[pixel].Green;
-	    *eip++ = cmo->Colors[pixel].Blue;
-	  }
-	row += interlace ? InterlacedJumps[pass] : 1;
 }
+/* now instantiate */
+MAYBE_DEVMETH (XDEVICE (ii->device),
+		   init_image_instance_from_eimage,
+		   (ii, width, height, unwind.giffile->ImageCount, unwind.eimage, dest_mask,
+		    instantiator, domain));
 }
-/* now instantiate */
-MAYBE_DEVMETH (XDEVICE (ii->device),
+/* We read the gif successfully. If we have more than one slice then
-		 init_image_instance_from_eimage,
+animate the gif. */
-		 (ii, width, height, unwind.eimage, dest_mask,
+if (unwind.giffile->ImageCount > 1)
-		  instantiator, domain));
+{
+/* See if there is a timeout value. In theory there could be one
+for every image - but that makes the implementation way to
+complicated for now so we just take the first. */
+unsigned short timeout = 0;
+Lisp_Object tid;
+if (unwind.giffile->SavedImages[0].Function == GRAPHICS_EXT_FUNC_CODE
+	  &&
+	  unwind.giffile->SavedImages[0].ExtensionBlockCount)
+	{
+	  timeout = (unsigned short)
+	    ((unwind.giffile->SavedImages[0].ExtensionBlocks[0].Bytes[2] << 8) +
+	     unwind.giffile-> SavedImages[0].ExtensionBlocks[0].Bytes[1]) * 10;
+	}
+/* Too short a timeout will crucify us performance-wise. */
+tid = add_glyph_animated_timeout (timeout > 10 ? timeout : 10, image_instance);
+if (!NILP (tid))
+	IMAGE_INSTANCE_PIXMAP_TIMEOUT (ii) = XINT (tid);
+}
 unbind_to (speccount, Qnil);
 }
 #endif /* HAVE_GIF */
 return IMAGE_COLOR_PIXMAP_MASK;
 }
 struct png_memory_storage
 {
-CONST Extbyte *bytes;		/* The data       */
+const Extbyte *bytes;		/* The data       */
 Extcount len;			/* How big is it? */
 int index;			/* Where are we?  */
 };
 static void
 tbr->index = tbr->index + length;
 }
 struct png_error_struct
 {
-CONST char *err_str;
+const char *err_str;
 jmp_buf setjmp_buffer;	/* for return to caller */
 };
 /* jh 98/03/12 - #### AARRRGH! libpng includes jmp_buf inside its own
 structure, and there are cases where the size can be different from
 static void
 png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		 int dest_mask, Lisp_Object domain)
 {
-struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 struct png_unwind_data unwind;
 int speccount = specpdl_depth ();
 int height, width;
 struct png_memory_storage tbr;  /* Data to be read */
 }
 /* Initialize the IO layer and read in header information */
 {
 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
-CONST Extbyte *bytes;
+const Extbyte *bytes;
 Extcount len;
 assert (!NILP (data));
 /* #### This is a definite problem under Mule due to the amount of
 stack data it might allocate.  Need to think about using Lstreams */
-GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
 tbr.bytes = bytes;
 tbr.len = len;
 tbr.index = 0;
 png_set_read_fn (png_ptr,(void *) &tbr, png_read_from_memory);
 }
 	{
 	  warn_when_safe (Qpng, Qinfo, "Couldn't get background color!");
 	}
 else
 	{
-	  struct Lisp_Color_Instance *c;
+	  Lisp_Color_Instance *c;
 	  Lisp_Object rgblist;
 	  c = XCOLOR_INSTANCE (bkgd);
 	  rgblist = MAYBE_LISP_DEVMETH (XDEVICE (c->device),
 					color_instance_rgb_components,
 }
 /* now instantiate */
 MAYBE_DEVMETH (XDEVICE (ii->device),
 		 init_image_instance_from_eimage,
-		 (ii, width, height, unwind.eimage, dest_mask,
+		 (ii, width, height, 1, unwind.eimage, dest_mask,
 		  instantiator, domain));
 /* This will clean up everything else. */
 unbind_to (speccount, Qnil);
 }
 return mem->len;
 }
 struct tiff_error_struct
 {
-#if HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
 char err_str[256];
 #else
 char err_str[1024];		/* return the error string */
 #endif
 jmp_buf setjmp_buffer;	/* for return to caller */
 have any place to store error func data.  This should be rectified
 before XEmacs gets threads! */
 static struct tiff_error_struct tiff_err_data;
 static void
-tiff_error_func(CONST char *module, CONST char *fmt, ...)
+tiff_error_func(const char *module, const char *fmt, ...)
 {
 va_list vargs;
 va_start (vargs, fmt);
-#if HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
 vsnprintf (tiff_err_data.err_str, 255, fmt, vargs);
 #else
 /* pray this doesn't overflow... */
 vsprintf (tiff_err_data.err_str, fmt, vargs);
 #endif
 /* return to setjmp point */
 longjmp (tiff_err_data.setjmp_buffer, 1);
 }
 static void
-tiff_warning_func(CONST char *module, CONST char *fmt, ...)
+tiff_warning_func(const char *module, const char *fmt, ...)
 {
 va_list vargs;
-#if HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
 char warn_str[256];
 #else
 char warn_str[1024];
 #endif
 va_start (vargs, fmt);
-#if HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
 vsnprintf (warn_str, 255, fmt, vargs);
 #else
 vsprintf (warn_str, fmt, vargs);
 #endif
 va_end (vargs);
 static void
 tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		  Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		  int dest_mask, Lisp_Object domain)
 {
-struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
 tiff_memory_storage mem_struct;
 /* It is OK for the unwind data to be local to this function,
 because the unwind-protect is always executed when this
 stack frame is still valid. */
 struct tiff_unwind_data unwind;
 assert (!NILP (data));
 /* #### This is a definite problem under Mule due to the amount of
 stack data it might allocate.  Think about Lstreams... */
-GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+TO_EXTERNAL_FORMAT (LISP_STRING, data,
+			ALLOCA, (bytes, len),
+			Qbinary);
 mem_struct.bytes = bytes;
 mem_struct.len = len;
 mem_struct.index = 0;
 unwind.tiff = TIFFClientOpen ("memfile", "r", &mem_struct,
 				  (TIFFReadWriteProc)tiff_memory_read,
 				  (TIFFReadWriteProc)tiff_memory_write,
 				  tiff_memory_seek, tiff_memory_close, tiff_memory_size,
 				  tiff_map_noop, tiff_unmap_noop);
 if (!unwind.tiff)
-signal_image_error ("Insufficent memory to instantiate TIFF image", instantiator);
+signal_image_error ("Insufficient memory to instantiate TIFF image", instantiator);
 TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
 TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
 unwind.eimage = (unsigned char *) xmalloc (width * height * 3);
-/* ### This is little more than proof-of-concept/function testing.
+/* #### This is little more than proof-of-concept/function testing.
 It needs to be reimplemented via scanline reads for both memory
 compactness. */
 raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
 if (raster != NULL)
 {
 }
 /* now instantiate */
 MAYBE_DEVMETH (XDEVICE (ii->device),
 		 init_image_instance_from_eimage,
-		 (ii, width, height, unwind.eimage, dest_mask,
+		 (ii, width, height, 1, unwind.eimage, dest_mask,
 		  instantiator, domain));
 unbind_to (speccount, Qnil);
 }

Mercurial > hg > xemacs-beta

comparison src/glyphs-eimage.c @ 398:74fd4e045ea6 r21-2-29