CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 06/12/11 11:04:34

  Modified:    xemacs/src ChangeLog glyphs-eimage.c
Log:
2006-12-11  Aidan Kehoe  <kehoea at parhasard.net>

	* glyphs-eimage.c (png_warning_func):
	* glyphs-eimage.c (png_instantiate):
	* glyphs-eimage.c (tiff_warning_func):
	Decode external binary data as such before passing it to
	warn_when_safe().

Revision  Changes    Path
1.1031    +8 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1030
retrieving revision 1.1031
diff -u -p -r1.1030 -r1.1031
--- ChangeLog	2006/12/09 18:44:47	1.1030
+++ ChangeLog	2006/12/11 10:04:27	1.1031
@@ -1,3 +1,11 @@
+2006-12-11  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* glyphs-eimage.c (png_warning_func): 
+	* glyphs-eimage.c (png_instantiate): 
+	* glyphs-eimage.c (tiff_warning_func): 
+	Decode external binary data as such before passing it to 
+	warn_when_safe().  
+
 2006-12-09  Vin Shelton  <acs at xemacs.org>
 
 	* sound.c (init_native_sound): Fix typo in call to GTK_DEVICE



1.28      +19 -4     XEmacs/xemacs/src/glyphs-eimage.c

Index: glyphs-eimage.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-eimage.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glyphs-eimage.c	2005/11/26 11:46:08	1.27
+++ glyphs-eimage.c	2006/12/11 10:04:30	1.28
@@ -827,7 +827,10 @@ png_error_func (png_structp UNUSED (png_
 static void
 png_warning_func (png_structp UNUSED (png_ptr), png_const_charp msg)
 {
-  warn_when_safe (Qpng, Qinfo, "%s", msg);
+  DECLARE_EISTRING (eimsg);
+
+  eicpy_ext(eimsg, msg, Qbinary);  
+  warn_when_safe (Qpng, Qinfo, "%s", eidata(eimsg));
 }
 
 struct png_unwind_data
@@ -1018,16 +1021,21 @@ png_instantiate (Lisp_Object image_insta
        unobtrusive. */
     {
       int i;
+      DECLARE_EISTRING (key);
+      DECLARE_EISTRING (text);
 
       for (i = 0 ; i < info_ptr->num_text ; i++)
 	{
 	  /* How paranoid do I have to be about no trailing NULLs, and
 	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
 	     string somewhere? */
+          eireset(key);
+          eireset(text);
+          eicpy_ext(key, info_ptr->text[i].key, Qbinary);
+          eicpy_ext(text, info_ptr->text[i].text, Qbinary);
 
 	  warn_when_safe (Qpng, Qinfo, "%s - %s",
-			  info_ptr->text[i].key,
-			  info_ptr->text[i].text);
+			  eidata(key), eidata(text));
 	}
     }
 #endif
@@ -1221,6 +1229,8 @@ tiff_warning_func (const char *module, c
 #else
   char warn_str[1024];
 #endif
+  DECLARE_EISTRING (eimodule);
+  DECLARE_EISTRING (eiwarnstr);
 
   va_start (vargs, fmt);
 #ifdef HAVE_VSNPRINTF
@@ -1229,8 +1239,13 @@ tiff_warning_func (const char *module, c
   vsprintf (warn_str, fmt, vargs);
 #endif
   va_end (vargs);
+
+  eicpy_ext(eimodule, module, Qbinary);  
+  eicpy_ext(eiwarnstr, warn_str, Qbinary);  
+
   warn_when_safe (Qtiff, Qinfo, "%s - %s",
-		  module, warn_str);
+                  eidata(eimodule), 
+                  eidata(eiwarnstr));
 }
 
 static void