[rt #86659] treat a libpng header/lib version mismatch as probe failure

diff --git a/Changes b/Changes
index b28cf9372cf6a637ad83042d944cc440bbd680dc..7013449a3ccbd7378ea9295054aadda6397289a0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Imager release history.  Older releases can be found in Changes.old
 
+ - PNG: treat a version mismatch between headers and library as a
+   probe failure.
+   https://rt.cpan.org/Ticket/Display.html?id=86659
+
 Imager 0.96_01 - 1 Jun 2013
 ==============
 

diff --git a/PNG/Changes b/PNG/Changes
index ef3aae14f2e920abb64e8f4228387f87d6770782..1e0390d0bf7c4ff1f4e558207f5d370c9544e683 100644 (file)
--- a/PNG/Changes
+++ b/PNG/Changes
@@ -1,6 +1,15 @@
+Imager-File-PNG 0.89
+====================
+
+ - treat a version mismatch between library and headers as a probe
+   failure.
+   https://rt.cpan.org/Ticket/Display.html?id=86659
+
 Imager-File-PNG 0.88
 ====================
 
+Distributed with Imager 0.96_01.
+
  - support libpng 1.6
    https://rt.cpan.org/Ticket/Display.html?id=85746
 

diff --git a/PNG/Makefile.PL b/PNG/Makefile.PL
index a98e1742748af6a078c2407001cce8a5934ef15c..df6e32667c5df306c13c30e6d17d8df2c86b9d5f 100644 (file)
--- a/PNG/Makefile.PL
+++ b/PNG/Makefile.PL
@@ -159,6 +159,11 @@ sub _png_test_code {
   return <<'CODE';
 
 fprintf(stderr, "PNG: library version %ld, header version %ld\n", (long)png_access_version_number(),  (long)PNG_LIBPNG_VER);
+
+  if (png_access_version_number() != PNG_LIBPNG_VER) {
+     fprintf(stderr, "PNG: Your header version number doesn't match the library version number\n");
+     return 1;
+  }
 return 0;
 CODE
 }

diff --git a/PNG/PNG.pm b/PNG/PNG.pm
index 85de61cec29f03ea234e284ee1894b53422ec56f..23fe07545dc592f12710eb3742cf2dd67af79244 100644 (file)
--- a/PNG/PNG.pm
+++ b/PNG/PNG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.88";
+  $VERSION = "0.89";
 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);