From 7a1f21416695f5bc48ac90b677e40d830e58b60a Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 26 Apr 2010 22:40:56 -0500
Subject: [PATCH] [master] Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and
 PNG_NO_TIME_RFC1123 in

contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
---
 ANNOUNCE                          | 7 +++++--
 CHANGES                           | 5 ++++-
 contrib/pngminim/decoder/pngusr.h | 4 ++++
 contrib/pngminim/encoder/pngusr.h | 3 +++
 contrib/pngminim/preader/pngusr.h | 3 +++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 109d4a166..162a6df5b 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.2rc04 - April 26, 2010
+Libpng 1.4.2rc04 - April 27, 2010
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -44,9 +44,12 @@ version 1.4.2rc03 [April 24, 2010]
   Added some "(long)" typecasts to printf calls in png_handle_cHRM().
   Relaxed the overly-restrictive permissions of some files.
 
-version 1.4.2rc04 [April 26, 2010]
+version 1.4.2rc04 [April 27, 2010]
   Added the "vstudio" project to replace "visualc6" and "visualc71" which
     will be removed from libpng-1.5.0.
+  Demonstrate in example.c that lang_key should be initialized.
+  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1143 in
+    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index d2a25cf24..cf40a02d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2555,9 +2555,12 @@ version 1.4.2rc03 [April 24, 2010]
   Added some "(long)" typecasts to printf calls in png_handle_cHRM().
   Relaxed the overly-restrictive permissions of some files.
 
-version 1.4.2rc04 [April 26, 2010]
+version 1.4.2rc04 [April 27, 2010]
   Added the "vstudio" project to replace "visualc6" and "visualc71" which
     will be removed from libpng-1.5.0.
+  Demonstrate in example.c that lang_key should be initialized.
+  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1143 in
+    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index 6e40d6498..e014e73b2 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -23,6 +23,7 @@
 #define png_error(s1,s2) png_err(s1)
 #define png_chunk_error(s1,s2) png_err(s1)
 
+#define PNG_NO_READ_BGR
 #define PNG_NO_READ_GAMMA
 #define PNG_NO_READ_BACKGROUND
 #define PNG_NO_READ_QUANTIZE
@@ -59,6 +60,7 @@
 #define PNG_NO_WRITE_SUPPORTED
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -71,5 +73,7 @@
 #define PNG_NO_PROGRESSIVE_READ
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
+#define PNG_NO_TIME_RFC1123
 
 #endif /* MINRDPNGCONF_H */
+
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index 02eeaa8c7..b4024aa0b 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -22,6 +22,7 @@
 #define png_chunk_error(s1,s2) png_err(s1)
 
 #define PNG_NO_WRITE_BACKGROUND
+#define PNG_NO_WRITE_BGR
 #define PNG_NO_WRITE_GAMMA
 #define PNG_NO_WRITE_QUANTIZE
 #define PNG_NO_WRITE_INVERT
@@ -58,6 +59,7 @@
 #define PNG_NO_WRITE_FLUSH
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -69,5 +71,6 @@
 #define PNG_NO_EASY_ACCESS
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
+#define PNG_NO_TIME_RFC1143
 
 #endif /* MINWRPNGCONF_H */
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index ca851e0e2..bfaa723c9 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -19,6 +19,7 @@
 #define png_error(s1,s2) png_err(s1)
 #define png_chunk_error(s1,s2) png_err(s1)
 
+#define PNG_NO_READ_BGR
 #define PNG_NO_READ_DITHER
 #define PNG_NO_READ_INVERT
 #define PNG_NO_READ_SHIFT
@@ -50,6 +51,7 @@
 #define PNG_NO_WRITE_SUPPORTED
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -61,5 +63,6 @@
 #define PNG_NO_EASY_ACCESS
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
+#define PNG_NO_TIME_RFC1143
 
 #endif /* MINPRDPNGCONF_H */