JPEG: fix some format string/argument type mismatches

diff --git a/JPEG/Changes b/JPEG/Changes
index 6c45dfb02f8b549d897e29ebb23e014269568af5..4cbe4bb80be78fcbb1b9ffebd14e490811ccf9a4 100644 (file)
--- a/JPEG/Changes
+++ b/JPEG/Changes
@@ -1,3 +1,8 @@
+Imager-File-JPEG 0.87
+=====================
+
+ - fix some mismatched format strings/types
+
 Imager-File-JPEG 0.86
 =====================
 

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

diff --git a/JPEG/imexif.c b/JPEG/imexif.c
index 4aa903189cc5978fb8801d71cb8df297f2dffdeb..305e36e719e65bae05334f17b83a8bb12b1e161e 100644 (file)
--- a/JPEG/imexif.c
+++ b/JPEG/imexif.c
@@ -1494,7 +1494,8 @@ tiff_get16s(imtiff *tiff, unsigned long offset) {
   int result;
 
   if (offset + 2 > tiff->size) {
-    mm_log((3, "attempt to get16 at %lu in %lu image", offset, tiff->size));
+    mm_log((3, "attempt to get16 at %lu in %lu image", offset,
+           (unsigned long)tiff->size));
     return 0;
   }
 
@@ -1522,7 +1523,8 @@ tiff_get32s(imtiff *tiff, unsigned long offset) {
   unsigned work;
 
   if (offset + 4 > tiff->size) {
-    mm_log((3, "attempt to get16 at %lu in %lu image", offset, tiff->size));
+    mm_log((3, "attempt to get16 at %lu in %lu image", offset,
+           (unsigned long)tiff->size));
     return 0;
   }
 
@@ -1552,7 +1554,8 @@ static double
 tiff_get_rat(imtiff *tiff, unsigned long offset) {
   unsigned long numer, denom;
   if (offset + 8 > tiff->size) {
-    mm_log((3, "attempt to get_rat at %lu in %lu image", offset, tiff->size));
+    mm_log((3, "attempt to get_rat at %lu in %lu image", offset,
+           (unsigned long)tiff->size));
     return 0;
   }
 
@@ -1578,7 +1581,8 @@ static double
 tiff_get_rats(imtiff *tiff, unsigned long offset) {
   long numer, denom;
   if (offset + 8 > tiff->size) {
-    mm_log((3, "attempt to get_rat at %lu in %lu image", offset, tiff->size));
+    mm_log((3, "attempt to get_rat at %lu in %lu image", offset,
+           (unsigned long)tiff->size));
     return 0;
   }