test code now reports the (compile-time) library version

diff --git a/JPEG/Changes b/JPEG/Changes
index 368fa8baac0ac523fdbf14c94796d135be6f1e0e..6c45dfb02f8b549d897e29ebb23e014269568af5 100644 (file)
--- a/JPEG/Changes
+++ b/JPEG/Changes
@@ -1,4 +1,11 @@
-Imager-File-JPEG 0.84
+Imager-File-JPEG 0.86
+=====================
+
+ - correct 0.85 header below
+
+ - test code now reports the (compile-time) library version
+
+Imager-File-JPEG 0.85
 =====================
 
  - avoid static variables when capturing IPTC data

diff --git a/JPEG/JPEG.pm b/JPEG/JPEG.pm
index 1812140e562daf5f67330ebe14d8eb88956916a2..07ea1a70834466f7622756ea18f89bb93a6e0eb9 100644 (file)
--- a/JPEG/JPEG.pm
+++ b/JPEG/JPEG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.85";
+  $VERSION = "0.86";
 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);

diff --git a/JPEG/JPEG.xs b/JPEG/JPEG.xs
index e1a55f9bbbae5fc8431ba3cda1c396d3b8a3ca1a..8a13fb3aec28d3c080a34fe274bda1b1bac384ad 100644 (file)
--- a/JPEG/JPEG.xs
+++ b/JPEG/JPEG.xs
@@ -13,6 +13,9 @@ DEFINE_IMAGER_CALLBACKS;
 
 MODULE = Imager::File::JPEG  PACKAGE = Imager::File::JPEG
 
+const char *
+i_libjpeg_version()
+
 undef_int
 i_writejpeg_wiol(im, ig, qfactor)
     Imager::ImgRaw     im

diff --git a/JPEG/imjpeg.c b/JPEG/imjpeg.c
index c9787bd5ba51cead5df37cf16caebbfc4258b7bb..c317e0af639738bf69ff1ca8246bcfde39b5d801 100644 (file)
--- a/JPEG/imjpeg.c
+++ b/JPEG/imjpeg.c
@@ -42,6 +42,9 @@ Reads and writes JPEG images
 
 #define JPEG_DIM_MAX JPEG_MAX_DIMENSION
 
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
 static unsigned char fake_eoi[]={(JOCTET) 0xFF,(JOCTET) JPEG_EOI};
 
 /* Source and Destination managers */
@@ -337,6 +340,25 @@ transfer_gray(i_color *out, JSAMPARRAY in, int width) {
 
 typedef void (*transfer_function_t)(i_color *out, JSAMPARRAY in, int width);
 
+static const char version_string[] =
+#ifdef LIBJPEG_TURBO_VERSION
+  "libjpeg-turbo " STRINGIFY(LIBJPEG_TURBO_VERSION) " api " STRINGIFY(JPEG_LIB_VERSION)
+#else
+  "libjpeg " STRINGIFY(JPEG_LIB_VERSION)
+#endif
+  ;
+
+/*
+=item i_libjpeg_version()
+
+=cut
+*/
+
+const char *
+i_libjpeg_version(void) {
+  return version_string;
+}
+
 /*
 =item i_readjpeg_wiol(data, length, iptc_itext, itlength)
 

diff --git a/JPEG/imjpeg.h b/JPEG/imjpeg.h
index 3c9be13289f10c56ef4d4858476c7e5f037f71d3..c6985005bd0da498594450b614a8d77466256732 100644 (file)
--- a/JPEG/imjpeg.h
+++ b/JPEG/imjpeg.h
@@ -9,4 +9,7 @@ i_readjpeg_wiol(io_glue *data, int length, char** iptc_itext, int *itlength);
 undef_int
 i_writejpeg_wiol(i_img *im, io_glue *ig, int qfactor);
 
+extern const char *
+i_libjpeg_version(void);
+
 #endif

diff --git a/JPEG/t/t10jpeg.t b/JPEG/t/t10jpeg.t
index a88554d78c756ed256b78573dda6379486024518..61c54dc5a977e6fb8c63c03c5fd83eee9b56a2ff 100644 (file)
--- a/JPEG/t/t10jpeg.t
+++ b/JPEG/t/t10jpeg.t
@@ -13,6 +13,8 @@ $Imager::formats{"jpeg"}
 
 plan tests => 103;
 
+print STDERR "libjpeg version: ", Imager::File::JPEG::i_libjpeg_version(), "\n";
+
 my $green=i_color_new(0,255,0,255);
 my $blue=i_color_new(0,0,255,255);
 my $red=i_color_new(255,0,0,255);