Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 3d9fabfe1c802070c3de14a5c0c7ccde > files > 1

libpng-1.2.31-2mdv2009.0.src.rpm

diff -ru4NwbB libpng-1.2.31/example.c libpng-1.2.32beta01/example.c
--- libpng-1.2.31/example.c	2008-08-21 05:54:13.217529130 -0500
+++ libpng-1.2.32beta01/example.c	2008-09-06 07:03:43.005943365 -0500
@@ -1,9 +1,9 @@
 
 #if 0 /* in case someone actually tries to compile this */
 
 /* example.c - an example of using libpng
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.32 [September 6, 2008]
  * This file has been placed in the public domain by the authors.
  * Maintained 1998-2008 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger)
  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -607,9 +607,9 @@
 #ifdef streams /* I/O initialization method 1 */
    /* set up the output control if you are using standard C streams */
    png_init_io(png_ptr, fp);
 #else no_streams /* I/O initialization method 2 */
-   /* If you are using replacement read functions, instead of calling
+   /* If you are using replacement write functions, instead of calling
     * png_init_io() here you would call */
    png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
       user_IO_flush_function);
    /* where user_io_ptr is a structure you want available to the callbacks */
diff -ru4NwbB libpng-1.2.31/png.h libpng-1.2.32beta01/png.h
--- libpng-1.2.31/png.h	2008-08-21 05:54:13.201378683 -0500
+++ libpng-1.2.32beta01/png.h	2008-09-06 07:03:42.990211483 -0500
@@ -197,12 +197,13 @@
  *    1.0.38rc01-08           10    10038  10.so.0.38[.0]
  *    1.2.30rc01-08           13    10230  12.so.0.30[.0]
  *    1.0.38                  10    10038  10.so.0.38[.0]
  *    1.2.30                  13    10230  12.so.0.30[.0]
- *    1.0.38rc01-03           10    10039  10.so.0.39[.0]
+ *    1.0.39rc01-03           10    10039  10.so.0.39[.0]
  *    1.2.31rc01-03           13    10231  12.so.0.31[.0]
- *    1.0.38                  10    10039  10.so.0.39[.0]
+ *    1.0.39                  10    10039  10.so.0.39[.0]
  *    1.2.31                  13    10231  12.so.0.31[.0]
+ *    1.2.32beta01            13    10232  12.so.0.32[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
  *    used for changes in backward compatibility, as it is intended.  The
diff -ru4NwbB libpng-1.2.31/pngpread.c libpng-1.2.32beta01/pngpread.c
--- libpng-1.2.31/pngpread.c	2008-08-21 05:54:13.254898477 -0500
+++ libpng-1.2.32beta01/pngpread.c	2008-09-06 07:03:43.043602194 -0500
@@ -1278,9 +1278,9 @@
 
                tmp = text;
                text = (png_charp)png_malloc(png_ptr, text_size +
                   (png_uint_32)(png_ptr->zbuf_size 
-                  - png_ptr->zstream.avail_out));
+                  - png_ptr->zstream.avail_out + 1));
                png_memcpy(text, tmp, text_size);
                png_free(png_ptr, tmp);
                png_memcpy(text + text_size, png_ptr->zbuf,
                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
diff -ru4NwbB libpng-1.2.31/pngtest.c libpng-1.2.32beta01/pngtest.c
--- libpng-1.2.31/pngtest.c	2008-08-21 05:54:13.309826047 -0500
+++ libpng-1.2.32beta01/pngtest.c	2008-09-06 07:03:43.098266011 -0500
@@ -1,8 +1,8 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.32 [September 6, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -81,11 +81,11 @@
 #include <time.h>
 #endif
 
 #if defined(PNG_TIME_RFC1123_SUPPORTED)
-#define PNG_tIME_STRING_LENGTH 30
+#define PNG_tIME_STRING_LENGTH 29
 static int tIME_chunk_present = 0;
-static char tIME_string[PNG_tIME_STRING_LENGTH] = "no tIME chunk present in file";
+static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
 #endif
 
 static int verbose = 0;