From 7e0cddbcab2b614d727d4ca5daa6c0e5377e31fd Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <ice@extreme.hu>
Date: Sat, 27 Apr 2013 16:48:22 +0200
Subject: [PATCH] 2013-04-27 16:46 UTC+0200 Tamas TEVESZ (ice extreme.hu)   *
 src/3rd/png/png.dif     + Regenerate after 67f0074

---
 ChangeLog.txt       |  4 ++++
 src/3rd/png/png.dif | 30 ++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f120627f2b..c2ed6e789c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-27 16:46 UTC+0200 Tamas TEVESZ (ice extreme.hu)
+  * src/3rd/png/png.dif
+    + Regenerate after 67f0074
+
 2013-04-26 14:31 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   + contrib/xhb/xhbinkey.ch
   + contrib/xhb/xhbkey.c
diff --git a/src/3rd/png/png.dif b/src/3rd/png/png.dif
index d2088b0106..3f33bb231b 100644
--- a/src/3rd/png/png.dif
+++ b/src/3rd/png/png.dif
@@ -1,6 +1,6 @@
-diff -urN png.orig\png.h png\png.h
---- png.orig\png.h	Thu Apr 04 05:52:29 2013
-+++ png\png.h	Thu Apr 04 05:52:29 2013
+diff -urN png.orig/png.h png/png.h
+--- png.orig/png.h	2013-04-27 16:42:08.881059927 +0200
++++ png/png.h	2013-04-27 16:42:08.881059927 +0200
 @@ -431,7 +431,7 @@
      /* If pnglibconf.h is missing, you can
       * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
@@ -10,10 +10,20 @@ diff -urN png.orig\png.h png\png.h
  #endif
  
  #ifndef PNG_VERSION_INFO_ONLY
-diff -urN png.orig\pnglconf.h png\pnglconf.h
---- png.orig\pnglconf.h	Thu Apr 04 05:52:29 2013
-+++ png\pnglconf.h	Thu Apr 04 05:52:29 2013
-@@ -187,7 +187,11 @@
+diff -urN png.orig/pnglconf.h png/pnglconf.h
+--- png.orig/pnglconf.h	2013-04-27 16:42:08.881059927 +0200
++++ png/pnglconf.h	2013-04-27 16:42:08.881059927 +0200
+@@ -114,7 +114,9 @@
+ #define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+ #define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+ #define PNG_SIMPLIFIED_WRITE_SUPPORTED
++#ifndef PNG_NO_STDIO
+ #define PNG_STDIO_SUPPORTED
++#endif
+ #define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
+ #define PNG_TEXT_SUPPORTED
+ #define PNG_TIME_RFC1123_SUPPORTED
+@@ -187,7 +189,11 @@
  #define PNG_zTXt_SUPPORTED
  /* end of options */
  /* settings */
@@ -26,9 +36,9 @@ diff -urN png.orig\pnglconf.h png\pnglconf.h
  #define PNG_CALLOC_SUPPORTED
  #define PNG_COST_SHIFT 3
  #define PNG_DEFAULT_READ_MACROS 1
-diff -urN png.orig\pngpriv.h png\pngpriv.h
---- png.orig\pngpriv.h	Thu Apr 04 05:52:29 2013
-+++ png\pngpriv.h	Thu Apr 04 05:52:29 2013
+diff -urN png.orig/pngpriv.h png/pngpriv.h
+--- png.orig/pngpriv.h	2013-04-27 16:42:08.881059927 +0200
++++ png/pngpriv.h	2013-04-27 16:42:08.881059927 +0200
 @@ -69,7 +69,7 @@
   * before png.h is included, but load the configuration now if it is available.
   */