diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-24 14:25:49 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-24 14:25:49 +0000 |
commit | 15a1a702e2fc9e590820a377d766a8c23ed0dc2b (patch) | |
tree | c2b315be0f58bb9ce438eafec943b4f2c6085307 | |
parent | 39ce3b6a639cff6dbcecfe5be99c2d64049e7a95 (diff) | |
download | netpbm-mirror-15a1a702e2fc9e590820a377d766a8c23ed0dc2b.tar.gz netpbm-mirror-15a1a702e2fc9e590820a377d766a8c23ed0dc2b.tar.xz netpbm-mirror-15a1a702e2fc9e590820a377d766a8c23ed0dc2b.zip |
Release 10.66.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2191 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | analyzer/pamsharpness.c | 2 | ||||
-rw-r--r-- | converter/other/exif.c | 23 | ||||
-rw-r--r-- | converter/other/exif.h | 3 | ||||
-rw-r--r-- | doc/HISTORY | 17 | ||||
-rw-r--r-- | version.mk | 2 |
5 files changed, 39 insertions, 8 deletions
diff --git a/analyzer/pamsharpness.c b/analyzer/pamsharpness.c index c5a97763..5943416f 100644 --- a/analyzer/pamsharpness.c +++ b/analyzer/pamsharpness.c @@ -151,7 +151,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 b94c1ef4..87d89bd7 100644 --- a/converter/other/exif.c +++ b/converter/other/exif.c @@ -87,6 +87,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 @@ -473,15 +476,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; @@ -839,8 +852,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 bae16726..490e08ed 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 93be873d..089ff532 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,23 @@ Netpbm. CHANGE HISTORY -------------- +14.04.24 BJH Release 10.66.02 + + 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.04.02 BJH Release 10.66.01 Build: Fix inconsistent use of upper and lower case Y and N in diff --git a/version.mk b/version.mk index 6c5c501f..deb359e3 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 66 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 |