Mercurial > hg > xemacs-beta

diff src/glyphs-x.c @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 27bc7f280385
line wrap: on
line diff
--- a/src/glyphs-x.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/src/glyphs-x.c	Mon Aug 13 08:46:35 2007 +0200
@@ -1881,12 +1881,11 @@
 static void png_read_from_memory(png_structp png_ptr, png_bytep data,
 				 png_uint_32 length)
 {
-   png_uint_32 check;
    struct png_memory_storage *tbr =
      (struct png_memory_storage *) png_get_io_ptr (png_ptr);
 
    if (length > (tbr->len - tbr->index))
-     png_error(png_ptr, "Read Error");
+     png_error (png_ptr, (png_const_charp) "Read Error");
    memcpy(data,tbr->bytes + tbr->index,length);
    tbr->index = tbr->index + length;
 }
@@ -1939,6 +1938,8 @@
   return Qnil;
 }
 
+/* This doesn't appear to be used. */
+#if 0
 #define get_png_val(p) _get_png_val (&(p), info_ptr.bit_depth)
 png_uint_16
 _get_png_val (png_byte **pp, int bit_depth)
@@ -1952,6 +1953,7 @@
 
   return c;
 }
+#endif
 
 static void
 png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,