[libpng15] Revised project files and contrib/pngvalid/pngvalid.c to account for

the relocation of pngvalid into contrib/libtests.

7 files changed, 22 insertions, 14 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index ee1c973e8..4efba2952 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.7rc01 - December 1, 2011
+Libpng 1.5.7rc02 - December 2, 2011
 
 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.5.7rc01.tar.xz (LZMA-compressed, recommended)
-   1.5.7rc01.tar.gz
-   1.5.7rc01.tar.bz2
+   1.5.7rc02.tar.xz (LZMA-compressed, recommended)
+   1.5.7rc02.tar.gz
+   1.5.7rc02.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp157r01.7z  (LZMA-compressed, recommended)
-   lp157r01.zip
+   lp157r02.7z  (LZMA-compressed, recommended)
+   lp157r02.zip
 
 Other information:
 
-   1.5.7rc01-README.txt
-   1.5.7rc01-LICENSE.txt
+   1.5.7rc02-README.txt
+   1.5.7rc02-LICENSE.txt
 
 Changes since the last public release (1.5.6):
 
@@ -117,6 +117,10 @@ Version 1.5.7rc01 [December 1, 2011]
   Replaced an "#if" with "#ifdef" in pngrtran.c
   Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
 
+Version 1.5.7rc02 [December 2, 2011]
+  Revised project files and contrib/pngvalid/pngvalid.c to account for
+    the relocation of pngvalid into contrib/libtests.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index f06af3a1c..d65313a5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3762,6 +3762,10 @@ Version 1.5.7rc01 [December 1, 2011]
   Replaced an "#if" with "#ifdef" in pngrtran.c
   Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
 
+Version 1.5.7rc02 [December 2, 2011]
+  Revised project files and contrib/pngvalid/pngvalid.c to account for
+    the relocation of pngvalid into contrib/libtests.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index 096d2ae4b..4c5f3061d 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include "../../config.h"
 #endif
 
 #ifdef HAVE_FEENABLEEXCEPT
@@ -90,7 +90,7 @@ typedef png_byte *png_const_bytep;
 #endif
 
 /***************************** EXCEPTION HANDLING *****************************/
-#include "contrib/visupng/cexcept.h"
+#include "../visupng/cexcept.h"
 
 #ifdef __cplusplus
 #  define this not_the_cpp_this
diff --git a/projects/owatcom/pngvalid.tgt b/projects/owatcom/pngvalid.tgt
index 83d47490c..cffdb8dee 100644
--- a/projects/owatcom/pngvalid.tgt
+++ b/projects/owatcom/pngvalid.tgt
@@ -193,7 +193,7 @@ WVList
 47
 MItem
 16
-..\..\pngvalid.c
+..\..\contrib\libtests\pngvalid.c
 48
 WString
 4
diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj
index 5173cb09f..6a0a6e4f3 100644
--- a/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ b/projects/vstudio/pngvalid/pngvalid.vcxproj
@@ -210,7 +210,7 @@
     </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\pngvalid.c" />
+    <ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 4cd73bcd3..dfbef163b 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.7rc01 - December 1, 2011
+libpng version 1.5.7rc02 - December 2, 2011
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 6ca55c1ec..709ae2878 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.5.7rc01 - December 1, 2011
+ * libpng version 1.5.7rc02 - December 2, 2011
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *