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

comparison src/glyphs-x.c @ 114:8619ce7e4c50 r20-1b9

Import from CVS: tag r20-1b9

author	cvs
date	Mon, 13 Aug 2007 09:21:54 +0200
parents	48d667d6f17f
children	9f59509498e1

comparison

equal deleted inserted replaced

-:2ec2fe4a4c89
+:8619ce7e4c50
 	  sprintf (buf, "/0x%lx", (unsigned long) IMAGE_INSTANCE_X_MASK (p));
 	  write_c_string (buf, printcharfun);
 	}
 write_c_string (")", printcharfun);
 break;
+#if HAVE_SUBWINDOWS
 case IMAGE_SUBWINDOW:
 /* #### implement me */
+#endif
 default:
 break;
 }
 }
 case IMAGE_COLOR_PIXMAP:
 case IMAGE_POINTER:
 if (IMAGE_INSTANCE_X_NPIXELS (p1) != IMAGE_INSTANCE_X_NPIXELS (p2))
 	return 0;
 break;
+#if HAVE_SUBWINDOWS
 case IMAGE_SUBWINDOW:
 /* #### implement me */
+#endif
 break;
 default:
 break;
 }
 {
 case IMAGE_MONO_PIXMAP:
 case IMAGE_COLOR_PIXMAP:
 case IMAGE_POINTER:
 return IMAGE_INSTANCE_X_NPIXELS (p);
+#if HAVE_SUBWINDOWS
 case IMAGE_SUBWINDOW:
 /* #### implement me */
+#endif
 return 0;
 default:
 return 0;
 }
 }
 #include "jpeglib.h"
 #include "jerror.h"
 /* The in-core jpeg code doesn't work, so I'm avoiding it for now.  -sb  */
-#define USE_TEMP_FILES_FOR_JPEG_IMAGES 1
+/* Late-breaking update, we're going to give it a try, I think it's */
+/* fixed now -sb */
+/*#define USE_TEMP_FILES_FOR_JPEG_IMAGES 1*/
 #define USE_TEMP_FILES_FOR_PNG_IMAGES 1
 static void
 jpeg_validate (Lisp_Object instantiator)
 {
 METHODDEF(boolean)
 #else
 METHODDEF boolean
 #endif
 our_fill_input_buffer (j_decompress_ptr cinfo) {
-ERREXIT(cinfo,JERR_INPUT_EOF);
+/* Insert a fake EOI marker */
-return FALSE;
+struct jpeg_source_mgr *src = (struct jpeg_source_mgr *) cinfo->src;
+static JOCTET buffer[2];
+buffer[0] = (JOCTET) 0xFF;
+buffer[1] = (JOCTET) JPEG_EOI;
+src->next_input_byte = buffer;
+src->bytes_in_buffer = 2;
+return TRUE;
 }
 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61)
 METHODDEF(void)
 #else
 METHODDEF void
 #endif
 our_skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
+struct jpeg_source_mgr *src = NULL;
+src = (struct jpeg_source_mgr *) cinfo->src;
+if (!src) {
+return;
+} else if (num_bytes > src->bytes_in_buffer) {
+ERREXIT(cinfo, JERR_INPUT_EOF);
+/*NOTREACHED*/
+}
+src->bytes_in_buffer -= num_bytes;
+src->next_input_byte += num_bytes;
 }
 #if defined(JPEG_LIB_VERSION) && (JPEG_LIB_VERSION >= 61)
 METHODDEF(void)
 #else
 typedef struct {
 struct jpeg_source_mgr pub;
 } our_jpeg_source_mgr;
-static void jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data,
+static void
-			     unsigned int len)
+jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, unsigned int len)
 {
 struct jpeg_source_mgr *src = NULL;
 if (cinfo->src == NULL) {	/* first time for this JPEG object? */
 cinfo->src = (struct jpeg_source_mgr *)
 }
 return Qnil;
 }
+#if 0
 /* We provide our own version of DGifSlurp() because the standardly
 provided one doesn't handle interlaced GIFs.  This is based on
 code in gif2x11.c. */
 /* Return value is GIF_ERROR, GIF_OK, or -1.
 done:
 return GIF_OK;
 }
+#endif
 static void
 gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		 int dest_mask)
 {
 gif_decode_error:
 	signal_simple_error ("Unable to decode GIF",
 			     build_string (EmacsPrintGifError ()));
 }
-#if 1
+#if 0
 if (our_own_dgif_slurp_from_gif2x11_c(unwind.giffile) != GIF_OK)
 #else
 /* DGifSlurp() doesn't handle interlaced files. */
+/* Actually, it does, sort of.  It just sets the Interlace flag
+and stores RasterBits in interlaced order.  We handle that below. */
 if (DGifSlurp (unwind.giffile) != GIF_OK)
 #endif
 goto gif_decode_error;
 }
 {
 int height = unwind.giffile->SHeight;
 int width = unwind.giffile->SWidth;
 int depth;
 int bitmap_pad;
-int i, j;
+int i, j, row, pass, interlace;
+/* 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 };
 depth = DefaultDepthOfScreen (scr);
 /* first get bitmap_pad (from XPM) */
 if (depth > 16)
 long run, what with all the XPM overhead.  If this proves
 to be a bottleneck here, maybe we should just copy the
 optimization routines from XPM (they're in turn mostly
 copied from the Xlib source code). */
+/* Note: We just use the first image in the file and ignore the rest.
+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_simple_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;
 for (i = 0; i < height; i++)
-for (j = 0; j < width; j++)
+{
-	XPutPixel (unwind.ximage, j, i,
+	if (interlace && row >= height)
-		   unwind.pixels[(unsigned char)
+	  row = InterlacedOffset[++pass];
-				 /* incorrect signed declaration
-				    of RasterBits[] */
+	for (j = 0; j < width; j++)
-				 (unwind.giffile->SavedImages->
+	  XPutPixel (unwind.ximage, j, row,
-				  RasterBits[i * width + j])]);
+		     unwind.pixels[(unsigned char)
+				  /* incorrect signed declaration
+				     of RasterBits[] */
+				  (unwind.giffile->SavedImages[0].
+				   RasterBits[i * width + j])]);
+	row += interlace ? InterlacedJumps[pass] : 1;
+}
 }
 /* 4. Now create the pixmap and set up the image instance */
 init_image_instance_from_x_image (ii, unwind.ximage, dest_mask,
 				    unwind.pixels, unwind.npixels,
 return 1;
 }
 }
+#if HAVE_SUBWINDOWS
 /************************************************************************/
 /*                               subwindows                             */
 /************************************************************************/
 Lisp_Object Qsubwindowp;
 XMapWindow (DisplayOfScreen (XSUBWINDOW (subwindow)->xscreen),
 	      XSUBWINDOW (subwindow)->subwindow);
 return subwindow;
 }
+#endif
 /************************************************************************/
 /*                            initialization                            */
 /************************************************************************/
 void
 syms_of_glyphs_x (void)
 {
+#if HAVE_SUBWINDOWS
 defsymbol (&Qsubwindowp, "subwindowp");
 DEFSUBR (Fmake_subwindow);
 DEFSUBR (Fchange_subwindow_property);
 DEFSUBR (Fsubwindowp);
 DEFSUBR (Fsubwindow_width);
 DEFSUBR (Fsubwindow_height);
 DEFSUBR (Fsubwindow_xid);
 DEFSUBR (Fresize_subwindow);
 DEFSUBR (Fforce_subwindow_map);
+#endif
 defkeyword (&Q_mask_file, ":mask-file");
 defkeyword (&Q_mask_data, ":mask-data");
 defkeyword (&Q_hotspot_x, ":hotspot-x");
 defkeyword (&Q_hotspot_y, ":hotspot-y");

Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 114:8619ce7e4c50 r20-1b9