- updated to 1.4.7

Changed files:
    crossmingw32-libpng.spec -> 1.48
    libpng-apng.patch -> 1.7

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index 4689f5214183efc51747357b87b15f33707df989..e138fb5c14d4d0af28e1c20f2a68c48cba022d69 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,12 +2,12 @@
 Summary:       PNG library - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.4.5
-Release:       2
+Version:       1.4.7
+Release:       1
 License:       distributable
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5: 37d420c7d8294aac438c150bb4335901
+# Source0-md5: b074cc1b0318db12a74022526e5236ff
 Patch0:                %{realname}-pngminus.patch
 # http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
 Patch1:                %{realname}-apng.patch

diff --git a/libpng-apng.patch b/libpng-apng.patch
index d89fbad9522cd7712937e9cc0f2ba57c77091704..161b110399a561c87b9a7ed647004cb0a4b45299 100644 (file)
--- a/libpng-apng.patch
+++ b/libpng-apng.patch
@@ -2,7 +2,7 @@ Index: pngread.c
 ===================================================================
 --- pngread.c
 +++ pngread.c
-@@ -300,6 +300,11 @@
+@@ -278,6 +278,11 @@
  #ifdef PNG_READ_zTXt_SUPPORTED
        PNG_zTXt;
  #endif
@@ -14,7 +14,7 @@ Index: pngread.c
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
  
-@@ -343,6 +348,9 @@
+@@ -321,6 +326,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;
-@@ -415,12 +423,95 @@
+@@ -393,12 +401,95 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
@@ -120,7 +120,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)
-@@ -461,6 +552,10 @@
+@@ -439,6 +530,10 @@
  png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
  {
     PNG_IDAT;
@@ -128,10 +128,10 @@ Index: pngread.c
 +   PNG_fdAT;
 +   PNG_IEND;
 +#endif
+ #ifdef PNG_READ_INTERLACING_SUPPORTED
     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};
-@@ -596,13 +691,39 @@
+@@ -583,13 +678,39 @@
     {
        if (!(png_ptr->zstream.avail_in))
        {
@@ -173,7 +173,7 @@ Index: pngread.c
           }
           png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
           png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -620,6 +741,9 @@
+@@ -607,6 +728,9 @@
              png_benign_error(png_ptr, "Extra compressed data");
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
@@ -183,7 +183,7 @@ Index: pngread.c
           break;
        }
        if (ret != Z_OK)
-@@ -875,6 +999,11 @@
+@@ -862,6 +986,11 @@
  #ifdef PNG_READ_zTXt_SUPPORTED
        PNG_zTXt;
  #endif
@@ -195,7 +195,7 @@ Index: pngread.c
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
  
-@@ -974,6 +1103,14 @@
+@@ -961,6 +1090,14 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif