[master] Imported from libpng-1.2.42beta02.tarv1.2.42beta02

3 files changed, 12 insertions, 5 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index ebb3cbae8..2cccd8aa4 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -54,7 +54,7 @@ version 1.2.42beta01 [December 4, 2009]
 
 version 1.2.42beta02 [December 11, 2009]
   Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
-  Relocated png_do_chop() to its original position in pngrtran.c; the
+  Relocated png_do_chop() to its original position in pngrtran.c. The
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
diff --git a/CHANGES b/CHANGES
index efc9d0e47..a2506bb50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2617,7 +2617,7 @@ version 1.2.42beta01 [December 4, 2009]
 
 version 1.2.42beta02 [December 11, 2009]
   Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
-  Relocated png_do_chop() to its original position in pngrtran.c; the
+  Relocated png_do_chop() to its original position in pngrtran.c. The
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
diff --git a/KNOWNBUG b/KNOWNBUG
index 252294e31..7d4be8bbb 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,17 +1,24 @@
 
 Known bugs in libpng version 1.2.42beta02
 
-1. February 23, 2006: The custom makefiles don't build libpng with -lz.
+1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently
+   defined in libpng-1.2.41/pngconf.h, which may cause a problem with
+   building a binary-compatible library.
+
+   STATUS: This will be fixed in libpng-1.2.42.  In the meantime, simply
+   delete the definition from line :
+
+2. February 23, 2006: The custom makefiles don't build libpng with -lz.
 
    STATUS: This is a subject of debate. The change will probably be made
    as a part of a major overhaul of the makefiles in libpng version 1.4.0.
 
-2. February 24, 2006: The Makefile generated by the "configure" script
+3. February 24, 2006: The Makefile generated by the "configure" script
    fails to install symbolic links
    libpng12.so => libpng12.so.0.1.2.9betaN
    that are generated by the custom makefiles.
 
-3. September 4, 2007:  There is a report that pngtest crashes on MacOS 10.
+4. September 4, 2007:  There is a report that pngtest crashes on MacOS 10.
 
    STATUS: workarounds are
       1) Compile without optimization (crashes are observed with