Update libpng to 1.2.38 to patch a minor security issue.

10 files changed, 56 insertions, 20 deletions

diff --git a/contrib/pngminim/decoder/README b/contrib/pngminim/decoder/README
index 4f71082..a656e0b 100644
--- a/contrib/pngminim/decoder/README
+++ b/contrib/pngminim/decoder/README
@@ -1,6 +1,9 @@
 This demonstrates the use of PNG_USER_CONFIG and pngusr.h
 
-To build a minimal read-only decoder, run
+To build a minimal read-only decoder with embedded libpng and zlib, run
+
     gather.sh  # to collect needed files from pngminus, libpng, and zlib
-    make -f makefile.std
- 
+    make
+
+If you prefer to use the shared libraries, go to contrib/pngminus
+and build the png2pnm application there. 
diff --git a/contrib/pngminim/decoder/gather.sh b/contrib/pngminim/decoder/gather.sh
index e28ddaf..6230e81 100755
--- a/contrib/pngminim/decoder/gather.sh
+++ b/contrib/pngminim/decoder/gather.sh
@@ -1,7 +1,7 @@
 cp ../../pngminus/png2pnm.c pngm2pnm.c
 cp ../../../*.h .
 cp ../../../*.c .
-rm example.c pnggccrd.c pngvcrd.c pngtest.c pngpread.c
+rm example.c pnggccrd.c pngvcrd.c pngtest.c pngpread.c pngw*.c
 # change the following 2 lines if zlib is somewhere else
 cp ../../../../zlib/*.h .
 cp ../../../../zlib/*.c .
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index f94b83a..4502c30 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -1,12 +1,21 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 2007 Glenn Randers-Pehrson
+ *
+ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the zlib/libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
  * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
  */
 
 #ifndef MINRDPNGCONF_H
 #define MINRDPNGCONF_H
 
+#ifdef NJET
+  /* No 16-bit support beyond reading with strip_16 */
+#endif
+
 #define PNG_NO_GLOBAL_ARRAYS
 
 #define PNG_NO_WARNINGS
@@ -26,6 +35,7 @@
 #define PNG_NO_READ_PACK
 #define PNG_NO_READ_PACKSWAP
 #define PNG_NO_READ_FILLER
+#define PNG_NO_READ_SWAP
 #define PNG_NO_READ_SWAP_ALPHA
 #define PNG_NO_READ_INVERT_ALPHA
 #define PNG_NO_READ_RGB_TO_GRAY
@@ -40,6 +50,7 @@
 #define PNG_NO_READ_sBIT
 #define PNG_NO_READ_sCAL
 #define PNG_NO_READ_sPLT
+#define PNG_NO_READ_sRGB
 #define PNG_NO_READ_TEXT
 #define PNG_NO_READ_tIME
 #define PNG_NO_READ_UNKNOWN_CHUNKS
diff --git a/contrib/pngminim/encoder/README b/contrib/pngminim/encoder/README
index 4a68fc8..2285544 100644
--- a/contrib/pngminim/encoder/README
+++ b/contrib/pngminim/encoder/README
@@ -1,6 +1,9 @@
 This demonstrates the use of PNG_USER_CONFIG and pngusr.h
 
-To build a minimal write-only encoder, run
+To build a minimal write-only decoder with embedded libpng and zlib, run
+
     gather.sh  # to collect needed files from pngminus, libpng, and zlib
-    make -f makefile.std
+    make
  
+If you prefer to use the shared libraries, go to contrib/pngminus
+and build the pnm2png application there. 
diff --git a/contrib/pngminim/encoder/gather.sh b/contrib/pngminim/encoder/gather.sh
index 7b0c803..46e04da 100755
--- a/contrib/pngminim/encoder/gather.sh
+++ b/contrib/pngminim/encoder/gather.sh
@@ -1,7 +1,7 @@
 cp ../../pngminus/pnm2png.c pnm2pngm.c
 cp ../../../*.h .
 cp ../../../*.c .
-rm example.c pnggccrd.c pngvcrd.c pngtest.c pngr*.c
+rm example.c pnggccrd.c pngvcrd.c pngtest.c pngr*.c pngpread.c
 # Change the next 2 lines if zlib is somewhere else.
 cp ../../../../zlib/*.h .
 cp ../../../../zlib/*.c .
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index 904673a..9f58c98 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -1,6 +1,11 @@
 /* minwrpngconf.h: headers to make a minimal png-write-only library
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 2007 Glenn Randers-Pehrson
+ *
+ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the zlib/libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
  * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
  */
 
@@ -26,6 +31,7 @@
 #define PNG_NO_WRITE_PACK
 #define PNG_NO_WRITE_PACKSWAP
 #define PNG_NO_WRITE_FILLER
+#define PNG_NO_WRITE_SWAP
 #define PNG_NO_WRITE_SWAP_ALPHA
 #define PNG_NO_WRITE_INVERT_ALPHA
 #define PNG_NO_WRITE_RGB_TO_GRAY
@@ -33,7 +39,6 @@
 #define PNG_NO_WRITE_bKGD
 #define PNG_NO_WRITE_cHRM
 #define PNG_NO_WRITE_gAMA
-#define PNG_NO_WRITE_sRGB
 #define PNG_NO_WRITE_hIST
 #define PNG_NO_WRITE_iCCP
 #define PNG_NO_WRITE_oFFs
@@ -42,6 +47,7 @@
 #define PNG_NO_WRITE_sBIT
 #define PNG_NO_WRITE_sCAL
 #define PNG_NO_WRITE_sPLT
+#define PNG_NO_WRITE_sRGB
 #define PNG_NO_WRITE_TEXT
 #define PNG_NO_WRITE_tIME
 #define PNG_NO_WRITE_UNKNOWN_CHUNKS
@@ -51,6 +57,7 @@
 #define PNG_NO_WRITE_FILTER
 #define PNG_NO_WRITE_WEIGHTED_FILTER
 #define PNG_NO_WRITE_INTERLACING_SUPPORTED
+#define PNG_NO_WRITE_FLUSH
 
 #define PNG_NO_INFO_IMAGE
 #define PNG_NO_USER_MEM
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index 959afe9..6154ce2 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -2,8 +2,11 @@
 //  PNGFILE.C -- Image File Functions
 //-------------------------------------
 
-// Copyright 2000, Willem van Schaik.  For conditions of distribution and
-// use, see the copyright/license/disclaimer notice in png.h
+// Copyright 2000, Willem van Schaik.
+//
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h
 
 #include <windows.h>
 #include <commdlg.h>
diff --git a/contrib/visupng/PngFile.h b/contrib/visupng/PngFile.h
index a900fd4..f695811 100644
--- a/contrib/visupng/PngFile.h
+++ b/contrib/visupng/PngFile.h
@@ -2,8 +2,11 @@
 //  PNGFILE.H -- Header File for pngfile.c
 //------------------------------------------
 
-// Copyright 2000, Willem van Schaik.  For conditions of distribution and
-// use, see the copyright/license/disclaimer notice in png.h
+// Copyright 2000, Willem van Schaik.
+
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/contrib/visupng/README.txt b/contrib/visupng/README.txt
index 4a753d8..4047119 100644
--- a/contrib/visupng/README.txt
+++ b/contrib/visupng/README.txt
@@ -1,8 +1,11 @@
 Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng
 ------------------------------------------------------------------------
 
-Copyright 2000, Willem van Schaik.  For conditions of distribution and
-use, see the copyright/license/disclaimer notice in png.h
+Copyright 2000, Willem van Schaik.
+
+This code is released under the libpng license.
+For conditions of distribution and use, see the disclaimer
+and license in png.h
 
 As a PNG .dll demo VisualPng is finished. More features would only hinder
 the program's objective. However, further extensions (like support for other 
diff --git a/contrib/visupng/VisualPng.c b/contrib/visupng/VisualPng.c
index f2cf6ee..2018999 100644
--- a/contrib/visupng/VisualPng.c
+++ b/contrib/visupng/VisualPng.c
@@ -2,8 +2,11 @@
 //  VisualPng.C -- Shows a PNG image
 //------------------------------------
 
-// Copyright 2000, Willem van Schaik.  For conditions of distribution and
-// use, see the copyright/license/disclaimer notice in png.h
+// Copyright 2000, Willem van Schaik.
+
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h
 
 // switches