Release 10.47.50

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2197 9d0c8265-081b-0410-96cb-a4ca84ce46f8

5 files changed, 39 insertions, 8 deletions

diff --git a/analyzer/pamsharpness.c b/analyzer/pamsharpness.c
index c0fc82ee..8e2d9a3f 100644
--- a/analyzer/pamsharpness.c
+++ b/analyzer/pamsharpness.c
@@ -146,7 +146,7 @@ main(int argc, char **argv) {
 
     computeSharpness(&inpam, tuplenarray, &sharpness);
 
-    pm_message("Sharpness = %f\n", sharpness);
+    printf("Sharpness = %f\n", sharpness);
 
 	pnm_freepamarrayn(tuplenarray, &inpam);
     pm_close(ifP);
diff --git a/converter/other/exif.c b/converter/other/exif.c
index 19f108a7..f9592d6c 100644
--- a/converter/other/exif.c
+++ b/converter/other/exif.c
@@ -86,6 +86,9 @@ static int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
 
 #define TAG_ORIENTATION       0x0112
 
+#define TAG_XRESOLUTION       0x011A
+#define TAG_YRESOLUTION       0x011B
+
 #define TAG_EXPOSURETIME      0x829A
 #define TAG_FNUMBER           0x829D
 
@@ -472,15 +475,25 @@ ProcessExifDir(unsigned char *  const ExifData,
         switch(Tag){
 
             case TAG_MAKE:
-                strncpy(ImageInfoP->CameraMake, (char*)ValuePtr, 31);
+                STRSCPY(ImageInfoP->CameraMake, (char*)ValuePtr);
                 break;
 
             case TAG_MODEL:
-                strncpy(ImageInfoP->CameraModel, (char*)ValuePtr, 39);
+                STRSCPY(ImageInfoP->CameraModel, (char*)ValuePtr);
                 break;
 
+            case TAG_XRESOLUTION:
+                ImageInfoP->XResolution = 
+                    ConvertAnyFormat(ValuePtr, Format);
+                break;
+    
+            case TAG_YRESOLUTION:
+                ImageInfoP->YResolution = 
+                    ConvertAnyFormat(ValuePtr, Format);
+                break;
+    
             case TAG_DATETIME_ORIGINAL:
-                strncpy(ImageInfoP->DateTime, (char*)ValuePtr, 19);
+                STRSCPY(ImageInfoP->DateTime, (char*)ValuePtr);
                 ImageInfoP->DatePointer = (char*)ValuePtr;
                 break;
 
@@ -838,8 +851,8 @@ ShowImageInfo(ImageInfo_t * const ImageInfoP)
     if (ImageInfoP->DateTime[0]){
         fprintf(stderr, "Date/Time    : %s\n",ImageInfoP->DateTime);
     }
-    fprintf(stderr, "Resolution   : %d x %d\n",
-            ImageInfoP->Width, ImageInfoP->Height);
+    fprintf(stderr, "Resolution   : %f x %f\n",
+            ImageInfoP->XResolution, ImageInfoP->YResolution);
     if (ImageInfoP->Orientation > 1){
 
         /* Only print orientation if one was supplied, and if its not
diff --git a/converter/other/exif.h b/converter/other/exif.h
index e5825e12..4630988f 100644
--- a/converter/other/exif.h
+++ b/converter/other/exif.h
@@ -16,7 +16,8 @@ typedef struct {
     char  CameraMake   [32];
     char  CameraModel  [40];
     char  DateTime     [20];
-    int   Height, Width;
+    float XResolution;
+    float YResolution;
     int   Orientation;
     int   IsColor;
     int   FlashUsed;
diff --git a/doc/HISTORY b/doc/HISTORY
index 6b7baa2c..6c3f8cde 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,23 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+14.04.30 BJH  Release 10.47.50
+
+              pamsharpness: put primary output on Standard Output instead of
+              on Standard Error as a Netpbm message.
+
+              jpegtopnm -dumpexif: fix incorrect display of resolution.
+              Always broken.  (-dumpexif was new in Netpbm 9.18 September
+              2001).
+
+              jpegtopnm -dumpexif: fix truncated make, model, or datetime.
+              Always broken.  (-dumpexif was new in Netpbm 9.18 September
+              2001).
+
+              jpegtopnm -dumpexif: fix wild pointer with invalid EXIF data.
+              Always broken.  (-dumpexif was new in Netpbm 9.18 September
+              2001).
+
 14.03.29 BJH  Release 10.47.49
 
               ppmrelief: fix out-of-bound values in output.  Always broken.
diff --git a/version.mk b/version.mk
index 815340cc..17cb3ccd 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 49
+NETPBM_POINT_RELEASE = 50