- updated for 1.2.38

Changed files:
    libpng-apng.patch -> 1.7
    libpng-export_old.patch -> 1.3

diff --git a/libpng-apng.patch b/libpng-apng.patch
index c7170ab55287ebcea0ed9bfc826e0a21c000d97d..d0d04de2e64195c90fdcf42228c903981e8f63c6 100644 (file)
--- a/libpng-apng.patch
+++ b/libpng-apng.patch
@@ -2,7 +2,7 @@ Index: pngread.c
 ===================================================================
 --- pngread.c
 +++ pngread.c
-@@ -410,6 +410,11 @@
+@@ -413,6 +413,11 @@
  #if defined(PNG_READ_zTXt_SUPPORTED)
        PNG_CONST PNG_zTXt;
  #endif
@@ -14,7 +14,7 @@ Index: pngread.c
  #endif /* PNG_USE_LOCAL_ARRAYS */
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -454,6 +459,9 @@
+@@ -457,6 +462,9 @@
                    !(png_ptr->mode & PNG_HAVE_PLTE))
              png_error(png_ptr, "Missing PLTE before IDAT");
  
@@ -24,7 +24,7 @@ Index: pngread.c
           png_ptr->idat_size = length;
           png_ptr->mode |= PNG_HAVE_IDAT;
           break;
-@@ -526,12 +534,97 @@
+@@ -529,12 +537,97 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
@@ -122,7 +122,7 @@ Index: pngread.c
  /* Optional call to update the users info_ptr structure */
  void PNGAPI
  png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -570,6 +663,10 @@
+@@ -573,6 +666,10 @@
  {
  #ifdef PNG_USE_LOCAL_ARRAYS
     PNG_CONST PNG_IDAT;
@@ -133,7 +133,7 @@ Index: pngread.c
     PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
        0xff};
     PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-@@ -700,13 +797,39 @@
+@@ -703,13 +800,39 @@
     {
        if (!(png_ptr->zstream.avail_in))
        {
@@ -175,7 +175,7 @@ Index: pngread.c
           }
           png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
           png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -724,6 +847,9 @@
+@@ -727,6 +850,9 @@
              png_error(png_ptr, "Extra compressed data");
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
@@ -185,7 +185,7 @@ Index: pngread.c
           break;
        }
        if (ret != Z_OK)
-@@ -978,6 +1104,11 @@
+@@ -981,6 +1107,11 @@
  #if defined(PNG_READ_zTXt_SUPPORTED)
        PNG_CONST PNG_zTXt;
  #endif
@@ -197,7 +197,7 @@ Index: pngread.c
  #endif /* PNG_USE_LOCAL_ARRAYS */
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -1078,6 +1209,14 @@
+@@ -1081,6 +1212,14 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
@@ -216,7 +216,7 @@ Index: pngget.c
 ===================================================================
 --- pngget.c
 +++ pngget.c
-@@ -835,6 +835,167 @@
+@@ -839,6 +839,167 @@
  }
  #endif
  
@@ -388,7 +388,7 @@ Index: png.c
 ===================================================================
 --- png.c
 +++ png.c
-@@ -51,6 +51,9 @@
+@@ -54,6 +54,9 @@
  PNG_tIME;
  PNG_tRNS;
  PNG_zTXt;
@@ -402,7 +402,7 @@ Index: png.h
 ===================================================================
 --- png.h
 +++ png.h
-@@ -1001,6 +1001,19 @@
+@@ -1016,6 +1016,19 @@
     png_fixed_point int_y_blue;
  #endif
  
@@ -422,7 +422,7 @@ Index: png.h
  } png_info;
  
  typedef png_info FAR * png_infop;
-@@ -1102,6 +1115,8 @@
+@@ -1117,6 +1130,8 @@
  #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
  #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
  #define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
@@ -431,7 +431,7 @@ Index: png.h
  
  /* This is used for the transformation routines, as some of them
   * change these values for the row.  It also should enable using
-@@ -1142,6 +1157,10 @@
+@@ -1157,6 +1172,10 @@
  typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
  typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
     png_uint_32, int));
@@ -442,7 +442,7 @@ Index: png.h
  #endif
  
  #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-@@ -1476,6 +1495,39 @@
+@@ -1491,6 +1510,39 @@
     png_uint_32 user_height_max;
  #endif
  
@@ -481,8 +481,8 @@ Index: png.h
 +
  /* New member added in libpng-1.0.25 and 1.2.17 */
  #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-    /* storage for unknown chunk that the library doesn't recognize. */
-@@ -1809,6 +1861,18 @@
+    /* Storage for unknown chunk that the library doesn't recognize. */
+@@ -1824,6 +1876,18 @@
  extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
     png_bytepp image));
  
@@ -498,10 +498,10 @@ Index: png.h
 +   png_infop png_info));
 +#endif
 +   
- /* writes the end of the PNG file. */
+ /* Writes the end of the PNG file. */
  extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
     png_infop info_ptr));
-@@ -2062,6 +2126,11 @@
+@@ -2077,6 +2141,11 @@
     png_voidp progressive_ptr,
     png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
     png_progressive_end_ptr end_fn));
@@ -511,9 +511,9 @@ Index: png.h
 +   png_progressive_frame_ptr frame_end_fn));
 +#endif
  
- /* returns the user pointer associated with the push read functions */
+ /* Returns the user pointer associated with the push read functions */
  extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-@@ -2499,6 +2568,59 @@
+@@ -2517,6 +2586,59 @@
  #endif
  #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
  
@@ -570,19 +570,19 @@ Index: png.h
 +   png_infop info_ptr));
 +#endif
 +
- #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
- /* provide a list of chunks and how they are to be handled, if the built-in
+ #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ /* Provide a list of chunks and how they are to be handled, if the built-in
     handling or default unknown chunk handling is not desired.  Any chunks not
-@@ -2860,6 +2982,8 @@
+@@ -2883,6 +3005,8 @@
  #define PNG_BACKGROUND_IS_GRAY     0x800
  #define PNG_HAVE_PNG_SIGNATURE    0x1000
  #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
 +#define PNG_HAVE_acTL             0x4000
 +#define PNG_HAVE_fcTL             0x8000L
  
- /* flags for the transformations the PNG library does on the image data */
+ /* Flags for the transformations the PNG library does on the image data */
  #define PNG_BGR                0x0001
-@@ -3000,6 +3124,9 @@
+@@ -3024,6 +3148,9 @@
  #define PNG_tIME png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
  #define PNG_tRNS png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
  #define PNG_zTXt png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
@@ -592,7 +592,7 @@ Index: png.h
  
  #ifdef PNG_USE_GLOBAL_ARRAYS
  PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
-@@ -3023,6 +3150,9 @@
+@@ -3047,6 +3174,9 @@
  PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
  PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
  PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
@@ -602,7 +602,7 @@ Index: png.h
  #endif /* PNG_USE_GLOBAL_ARRAYS */
  
  #if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-@@ -3297,6 +3427,17 @@
+@@ -3322,6 +3452,17 @@
  #endif
  #endif
  
@@ -620,7 +620,7 @@ Index: png.h
  /* Called when finished processing a row of data */
  PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
  
-@@ -3348,6 +3489,20 @@
+@@ -3373,6 +3514,20 @@
  PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
     png_infop info_ptr));
  
@@ -638,10 +638,10 @@ Index: png.h
 +   png_infop info_ptr, png_uint_32 width, png_uint_32 height));
 +#endif
 +
- /* these are the functions that do the transformations */
+ /* These are the functions that do the transformations */
  #if defined(PNG_READ_FILLER_SUPPORTED)
  PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-@@ -3563,6 +3718,18 @@
+@@ -3588,6 +3743,18 @@
     png_uint_32 length));
  #endif
  
@@ -664,7 +664,7 @@ Index: pngwrite.c
 ===================================================================
 --- pngwrite.c
 +++ pngwrite.c
-@@ -50,6 +50,10 @@
+@@ -53,6 +53,10 @@
     /* The rest of these check to see if the valid field has the appropriate
      * flag set, and if it does, writes the chunk.
      */
@@ -675,7 +675,7 @@ Index: pngwrite.c
  #if defined(PNG_WRITE_gAMA_SUPPORTED)
     if (info_ptr->valid & PNG_INFO_gAMA)
     {
-@@ -311,6 +315,10 @@
+@@ -314,6 +318,10 @@
        return;
     if (!(png_ptr->mode & PNG_HAVE_IDAT))
        png_error(png_ptr, "No IDATs written into file");
@@ -686,7 +686,7 @@ Index: pngwrite.c
  
     /* See if user wants us to write information chunks */
     if (info_ptr != NULL)
-@@ -1555,4 +1563,39 @@
+@@ -1558,4 +1566,39 @@
     params = params;
  }
  #endif
@@ -730,7 +730,7 @@ Index: pngconf.h
 ===================================================================
 --- pngconf.h
 +++ pngconf.h
-@@ -940,6 +940,10 @@
+@@ -944,6 +944,10 @@
  #  define PNG_READ_zTXt_SUPPORTED
  #  define PNG_zTXt_SUPPORTED
  #endif
@@ -738,10 +738,10 @@ Index: pngconf.h
 +#  define PNG_READ_APNG_SUPPORTED
 +#  define PNG_APNG_SUPPORTED
 +#endif
- #ifndef PNG_NO_READ_UNKNOWN_CHUNKS
- #  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- #  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
-@@ -1082,6 +1086,12 @@
+ #ifndef PNG_NO_READ_OPT_PLTE
+ #  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+ #endif                      /* optional PLTE chunk in RGB and RGBA images */
+@@ -1091,6 +1095,12 @@
  #    define PNG_zTXt_SUPPORTED
  #  endif
  #endif
@@ -751,14 +751,14 @@ Index: pngconf.h
 +#    define PNG_APNG_SUPPORTED
 +#  endif
 +#endif
- #ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
- #  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
- #  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+ #if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+     defined(PNG_WRITE_zTXt_SUPPORTED)
+ #  define PNG_WRITE_TEXT_SUPPORTED
 Index: pngpread.c
 ===================================================================
 --- pngpread.c
 +++ pngpread.c
-@@ -202,6 +202,11 @@
+@@ -205,6 +205,11 @@
  #if defined(PNG_READ_zTXt_SUPPORTED)
        PNG_CONST PNG_zTXt;
  #endif
@@ -770,7 +770,7 @@ Index: pngpread.c
  #endif /* PNG_USE_LOCAL_ARRAYS */
     /* First we make sure we have enough data for the 4 byte chunk name
      * and the 4 byte chunk length before proceeding with decoding the
-@@ -227,6 +232,103 @@
+@@ -230,6 +235,103 @@
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
     }
  
@@ -874,7 +874,7 @@ Index: pngpread.c
     if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
       if (png_ptr->mode & PNG_AFTER_IDAT)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-@@ -322,6 +424,9 @@
+@@ -325,6 +427,9 @@
              png_error(png_ptr, "Too many IDAT's found");
        }
  
@@ -884,7 +884,7 @@ Index: pngpread.c
        png_ptr->idat_size = png_ptr->push_length;
        png_ptr->mode |= PNG_HAVE_IDAT;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
-@@ -552,6 +657,38 @@
+@@ -555,6 +660,38 @@
     }
  
  #endif
@@ -923,7 +923,7 @@ Index: pngpread.c
     else
     {
        if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-@@ -726,13 +863,17 @@
+@@ -729,13 +866,17 @@
  png_push_read_IDAT(png_structp png_ptr)
  {
  #ifdef PNG_USE_LOCAL_ARRAYS
@@ -943,7 +943,7 @@ Index: pngpread.c
        {
           png_push_save_buffer(png_ptr);
           return;
-@@ -744,15 +885,62 @@
+@@ -747,15 +888,62 @@
        png_crc_read(png_ptr, png_ptr->chunk_name, 4);
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
  
@@ -1007,7 +1007,7 @@ Index: pngpread.c
     }
     if (png_ptr->idat_size && png_ptr->save_buffer_size)
     {
-@@ -1713,6 +1901,17 @@
+@@ -1716,6 +1904,17 @@
     png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
  }
  
@@ -1029,7 +1029,7 @@ Index: pngset.c
 ===================================================================
 --- pngset.c
 +++ pngset.c
-@@ -317,6 +317,11 @@
+@@ -320,6 +320,11 @@
        info_ptr->rowbytes = (png_size_t)0;
     else
        info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
@@ -1041,7 +1041,7 @@ Index: pngset.c
  }
  
  #if defined(PNG_oFFs_SUPPORTED)
-@@ -1004,6 +1009,142 @@
+@@ -1007,6 +1012,142 @@
  }
  #endif /* PNG_sPLT_SUPPORTED */
  
@@ -1188,7 +1188,7 @@ Index: pngrutil.c
 ===================================================================
 --- pngrutil.c
 +++ pngrutil.c
-@@ -421,6 +421,11 @@
+@@ -424,6 +424,11 @@
     filter_type = buf[11];
     interlace_type = buf[12];
  
@@ -1200,7 +1200,7 @@ Index: pngrutil.c
     /* Set internal variables */
     png_ptr->width = width;
     png_ptr->height = height;
-@@ -2227,6 +2232,168 @@
+@@ -2230,6 +2235,168 @@
  }
  #endif
  
@@ -1369,7 +1369,7 @@ Index: pngrutil.c
  /* This function is called when we haven't found a handler for a
     chunk.  If there isn't a problem with the chunk itself (ie bad
     chunk name, CRC, or a critical chunk), the chunk is silently ignored
-@@ -3241,4 +3408,84 @@
+@@ -3249,4 +3416,84 @@
  
     png_ptr->flags |= PNG_FLAG_ROW_INIT;
  }
@@ -1458,7 +1458,7 @@ Index: pngwutil.c
 ===================================================================
 --- pngwutil.c
 +++ pngwutil.c
-@@ -508,6 +508,11 @@
+@@ -511,6 +511,11 @@
     /* Write the chunk */
     png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
  
@@ -1470,7 +1470,7 @@ Index: pngwutil.c
     /* Initialize zlib with PNG info */
     png_ptr->zstream.zalloc = png_zalloc;
     png_ptr->zstream.zfree = png_zfree;
-@@ -630,6 +635,9 @@
+@@ -633,6 +638,9 @@
  {
  #ifdef PNG_USE_LOCAL_ARRAYS
     PNG_IDAT;
@@ -1480,7 +1480,7 @@ Index: pngwutil.c
  #endif
     png_debug(1, "in png_write_IDAT");
  
-@@ -674,7 +682,28 @@
+@@ -677,7 +685,28 @@
              "Invalid zlib compression method or flags in IDAT");
     }
  
@@ -1509,7 +1509,7 @@ Index: pngwutil.c
     png_ptr->mode |= PNG_HAVE_IDAT;
  }
  
-@@ -1716,6 +1745,70 @@
+@@ -1719,6 +1748,70 @@
  }
  #endif
  
@@ -1580,7 +1580,7 @@ Index: pngwutil.c
  /* Initializes the row writing capability of libpng */
  void /* PRIVATE */
  png_write_start_row(png_structp png_ptr)
-@@ -2119,6 +2212,8 @@
+@@ -2122,6 +2215,8 @@
  #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
     int num_p_filters = (int)png_ptr->num_prev_filters;
  #endif
@@ -1589,7 +1589,7 @@ Index: pngwutil.c
  
     png_debug(1, "in png_write_find_filter");
     /* Find out how many bytes offset each pixel is */
-@@ -2785,4 +2880,39 @@
+@@ -2788,4 +2883,39 @@
     }
  #endif
  }
@@ -1633,7 +1633,7 @@ Index: pngrtran.c
 ===================================================================
 --- pngrtran.c
 +++ pngrtran.c
-@@ -1322,7 +1322,7 @@
+@@ -1321,7 +1321,7 @@
         * pixels.  This check added to libpng-1.2.19
         */
  #if (PNG_WARN_UNINITIALIZED_ROW==1)

diff --git a/libpng-export_old.patch b/libpng-export_old.patch
index beddeb01375c563b108c8f26bef328154f0382c1..9cd079eb87427aa2b0af57797a28ed3e329de745 100644 (file)
--- a/libpng-export_old.patch
+++ b/libpng-export_old.patch
@@ -1,26 +1,26 @@
---- libpng-1.2.37/png.h~       2009-06-04 13:08:00.000000000 +0200
-+++ libpng-1.2.37/png.h        2009-06-18 10:46:50.000000000 +0200
-@@ -1827,16 +1827,16 @@
+--- libpng-1.2.38/png.h.orig   2009-07-16 12:58:31.000000000 +0200
++++ libpng-1.2.38/png.h        2009-07-19 18:19:09.000000000 +0200
+@@ -1842,16 +1842,16 @@
  extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
     png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
  
--/* free all memory used by the read (old method - NOT DLL EXPORTED) */
+-/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
 -extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
 -   png_infop end_info_ptr));
 +/* free all memory used by the read (old method) */
 +extern PNG_EXPORT(void,png_read_destroy) PNGARG((png_structp png_ptr,
 +   png_infop info_ptr, png_infop end_info_ptr));
  
- /* free any memory associated with the png_struct and the png_info_structs */
+ /* Free any memory associated with the png_struct and the png_info_structs */
  extern PNG_EXPORT(void,png_destroy_write_struct)
     PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
  
--/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+-/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
 -extern void png_write_destroy PNGARG((png_structp png_ptr));
-+/* free any memory used in png_ptr struct (old method) */
++/* Free any memory used in png_ptr struct (old method) */
 +extern PNG_EXPORT(void,png_write_destroy) PNGARG((png_structp png_ptr));
  
- /* set the libpng method of handling chunk CRC errors */
+ /* Set the libpng method of handling chunk CRC errors */
  extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
 --- libpng-1.2.37/pngread.c~   2009-06-04 13:08:00.000000000 +0200
 +++ libpng-1.2.37/pngread.c    2009-06-18 10:49:04.000000000 +0200