cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Rational2DoublePrecision' into 'master'

Browse Source 
Rational with Double Precision Upgrade

See merge request libtiff/libtiff!100
This commit is contained in:
Even Rouault 2020-02-27 20:28:18 +00:00
commit 27a1338723
8 changed files with 1655 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libtiff/tif_dir.c
View File

@ -29,6 +29,7 @@
* (and also some miscellaneous stuff)
*/
#include "tiffiop.h"
#include <float.h> /*--: for Rational2Double */
/*
* These are used in the backwards compatibility code...
@ -559,6 +560,10 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
* Set custom value ... save a copy of the custom tag value.
*/
tv_size = _TIFFDataSize(fip->field_type);
/*--: Rational2Double: For Rationals evaluate "set_field_type" to determine internal storage size. */
if (fip->field_type == TIFF_RATIONAL || fip->field_type == TIFF_SRATIONAL) {
tv_size = _TIFFSetGetFieldSize(fip->set_field_type);
}
if (tv_size == 0) {
status = 0;
TIFFErrorExt(tif->tif_clientdata, module,
@ -638,6 +643,7 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
|| fip->field_writecount == TIFF_VARIABLE2
|| fip->field_writecount == TIFF_SPP
|| tv->count > 1) {
/*--: Rational2Double: For Rationals tv_size is set above to 4 or 8 according to fip->set_field_type! */
_TIFFmemcpy(tv->value, va_arg(ap, void *),
tv->count * tv_size);
} else {
@ -698,6 +704,22 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
break;
case TIFF_RATIONAL:
case TIFF_SRATIONAL:
/*-- Rational2Double: For Rationals tv_size is set above to 4 or 8 according to fip->set_field_type! */
{
if (tv_size == 8) {
double v2 = va_arg(ap, double);
_TIFFmemcpy(val, &v2, tv_size);
} else {
/*-- default schould be tv_size == 4 */
float v3 = (float)va_arg(ap, double);
_TIFFmemcpy(val, &v3, tv_size);
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
TIFFErrorExt(0,"TIFFLib: _TIFFVSetField()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
}
}
}
break;
case TIFF_FLOAT:
{
float v2 = _TIFFClampDoubleToFloat(va_arg(ap, double));
@ -1200,6 +1222,23 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap)
break;
case TIFF_RATIONAL:
case TIFF_SRATIONAL:
{
/*-- Rational2Double: For Rationals evaluate "set_field_type" to determine internal storage size and return value size. */
int tv_size = _TIFFSetGetFieldSize(fip->set_field_type);
if (tv_size == 8) {
*va_arg(ap, double*) = *(double *)val;
ret_val = 1;
} else {
/*-- default schould be tv_size == 4 */
*va_arg(ap, float*) = *(float *)val;
ret_val = 1;
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
TIFFErrorExt(0,"TIFFLib: _TIFFVGetField()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
}
}
}
break;
case TIFF_FLOAT:
*va_arg(ap, float*) =
*(float *)val;

141
libtiff/tif_dirinfo.c
View File

@ -50,6 +50,15 @@ static const TIFFFieldArray exifFieldArray;
#ifdef _MSC_VER
#pragma warning( pop )
#endif
/*--: Rational2Double: --
* The Rational2Double upgraded libtiff functionality allows the definition and achievement of true double-precision accuracy
* for TIFF tags of RATIONAL type and field_bit=FIELD_CUSTOM using the set_field_type = TIFF_SETGET_DOUBLE.
* Unfortunately, that changes the old implemented interface for TIFFGetField().
* In order to keep the old TIFFGetField() interface behaviour those tags have to be redefined with set_field_type = TIFF_SETGET_FLOAT!
*
* Rational custom arrays are already defined as _Cxx_FLOAT, thus can stay.
*
*/
static const TIFFField
tiffFields[] = {
@ -75,12 +84,12 @@ tiffFields[] = {
{ TIFFTAG_STRIPBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_STRIPBYTECOUNTS, 0, 0, "StripByteCounts", NULL },
{ TIFFTAG_MINSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_MINSAMPLEVALUE, 1, 0, "MinSampleValue", NULL },
{ TIFFTAG_MAXSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_MAXSAMPLEVALUE, 1, 0, "MaxSampleValue", NULL },
{ TIFFTAG_XRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "XResolution", NULL },
{ TIFFTAG_YRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "YResolution", NULL },
{ TIFFTAG_XRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "XResolution", NULL },
{ TIFFTAG_YRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "YResolution", NULL },
{ TIFFTAG_PLANARCONFIG, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_PLANARCONFIG, 0, 0, "PlanarConfiguration", NULL },
{ TIFFTAG_PAGENAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PageName", NULL },
{ TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "XPosition", NULL },
{ TIFFTAG_YPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "YPosition", NULL },
{ TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "XPosition", NULL },
{ TIFFTAG_YPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "YPosition", NULL },
{ TIFFTAG_FREEOFFSETS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeOffsets", NULL },
{ TIFFTAG_FREEBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeByteCounts", NULL },
{ TIFFTAG_GRAYRESPONSEUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "GrayResponseUnit", NULL },
@ -163,7 +172,7 @@ tiffFields[] = {
{ TIFFTAG_BLACKLEVELDELTAV, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "BlackLevelDeltaV", NULL },
{ TIFFTAG_WHITELEVEL, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "WhiteLevel", NULL },
{ TIFFTAG_DEFAULTSCALE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultScale", NULL },
{ TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BestQualityScale", NULL },
{ TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BestQualityScale", NULL },
{ TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultCropOrigin", NULL },
{ TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultCropSize", NULL },
{ TIFFTAG_COLORMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ColorMatrix1", NULL },
@ -175,16 +184,16 @@ tiffFields[] = {
{ TIFFTAG_ANALOGBALANCE, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "AnalogBalance", NULL },
{ TIFFTAG_ASSHOTNEUTRAL, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "AsShotNeutral", NULL },
{ TIFFTAG_ASSHOTWHITEXY, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "AsShotWhiteXY", NULL },
{ TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineExposure", NULL },
{ TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineNoise", NULL },
{ TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineSharpness", NULL },
{ TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineExposure", NULL },
{ TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineNoise", NULL },
{ TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineSharpness", NULL },
{ TIFFTAG_BAYERGREENSPLIT, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BayerGreenSplit", NULL },
{ TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "LinearResponseLimit", NULL },
{ TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "LinearResponseLimit", NULL },
{ TIFFTAG_CAMERASERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraSerialNumber", NULL },
{ TIFFTAG_LENSINFO, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "LensInfo", NULL },
{ TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ChromaBlurRadius", NULL },
{ TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "AntiAliasStrength", NULL },
{ TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ShadowScale", NULL },
{ TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ChromaBlurRadius", NULL },
{ TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "AntiAliasStrength", NULL },
{ TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ShadowScale", NULL },
{ TIFFTAG_DNGPRIVATEDATA, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "DNGPrivateData", NULL },
{ TIFFTAG_MAKERNOTESAFETY, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "MakerNoteSafety", NULL },
{ TIFFTAG_CALIBRATIONILLUMINANT1, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CalibrationIlluminant1", NULL },
@ -219,8 +228,8 @@ tiffFields[] = {
static const TIFFField
exifFields[] = {
{ EXIFTAG_EXPOSURETIME, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureTime", NULL },
{ EXIFTAG_FNUMBER, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FNumber", NULL },
{ EXIFTAG_EXPOSURETIME, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureTime", NULL },
{ EXIFTAG_FNUMBER, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FNumber", NULL },
{ EXIFTAG_EXPOSUREPROGRAM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureProgram", NULL },
{ EXIFTAG_SPECTRALSENSITIVITY, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SpectralSensitivity", NULL },
{ EXIFTAG_ISOSPEEDRATINGS, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ISOSpeedRatings", NULL },
@ -229,17 +238,17 @@ exifFields[] = {
{ EXIFTAG_DATETIMEORIGINAL, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeOriginal", NULL },
{ EXIFTAG_DATETIMEDIGITIZED, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeDigitized", NULL },
{ EXIFTAG_COMPONENTSCONFIGURATION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ComponentsConfiguration", NULL },
{ EXIFTAG_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompressedBitsPerPixel", NULL },
{ EXIFTAG_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ShutterSpeedValue", NULL },
{ EXIFTAG_APERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ApertureValue", NULL },
{ EXIFTAG_BRIGHTNESSVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BrightnessValue", NULL },
{ EXIFTAG_EXPOSUREBIASVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureBiasValue", NULL },
{ EXIFTAG_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MaxApertureValue", NULL },
{ EXIFTAG_SUBJECTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistance", NULL },
{ EXIFTAG_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompressedBitsPerPixel", NULL },
{ EXIFTAG_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ShutterSpeedValue", NULL },
{ EXIFTAG_APERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ApertureValue", NULL },
{ EXIFTAG_BRIGHTNESSVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BrightnessValue", NULL },
{ EXIFTAG_EXPOSUREBIASVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureBiasValue", NULL },
{ EXIFTAG_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MaxApertureValue", NULL },
{ EXIFTAG_SUBJECTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistance", NULL },
{ EXIFTAG_METERINGMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MeteringMode", NULL },
{ EXIFTAG_LIGHTSOURCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LightSource", NULL },
{ EXIFTAG_FLASH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Flash", NULL },
{ EXIFTAG_FOCALLENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLength", NULL },
{ EXIFTAG_FOCALLENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLength", NULL },
{ EXIFTAG_SUBJECTAREA, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "SubjectArea", NULL },
{ EXIFTAG_MAKERNOTE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "MakerNote", NULL },
{ EXIFTAG_USERCOMMENT, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "UserComment", NULL },
@ -251,13 +260,13 @@ exifFields[] = {
{ EXIFTAG_PIXELXDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelXDimension", NULL },
{ EXIFTAG_PIXELYDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelYDimension", NULL },
{ EXIFTAG_RELATEDSOUNDFILE, 13, 13, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RelatedSoundFile", NULL },
{ EXIFTAG_FLASHENERGY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashEnergy", NULL },
{ EXIFTAG_FLASHENERGY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashEnergy", NULL },
{ EXIFTAG_SPATIALFREQUENCYRESPONSE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "SpatialFrequencyResponse", NULL },
{ EXIFTAG_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneXResolution", NULL },
{ EXIFTAG_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneYResolution", NULL },
{ EXIFTAG_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneXResolution", NULL },
{ EXIFTAG_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneYResolution", NULL },
{ EXIFTAG_FOCALPLANERESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneResolutionUnit", NULL },
{ EXIFTAG_SUBJECTLOCATION, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectLocation", NULL },
{ EXIFTAG_EXPOSUREINDEX, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureIndex", NULL },
{ EXIFTAG_EXPOSUREINDEX, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureIndex", NULL },
{ EXIFTAG_SENSINGMETHOD, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SensingMethod", NULL },
{ EXIFTAG_FILESOURCE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FileSource", NULL },
{ EXIFTAG_SCENETYPE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneType", NULL },
@ -265,10 +274,10 @@ exifFields[] = {
{ EXIFTAG_CUSTOMRENDERED, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CustomRendered", NULL },
{ EXIFTAG_EXPOSUREMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureMode", NULL },
{ EXIFTAG_WHITEBALANCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WhiteBalance", NULL },
{ EXIFTAG_DIGITALZOOMRATIO, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DigitalZoomRatio", NULL },
{ EXIFTAG_DIGITALZOOMRATIO, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DigitalZoomRatio", NULL },
{ EXIFTAG_FOCALLENGTHIN35MMFILM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLengthIn35mmFilm", NULL },
{ EXIFTAG_SCENECAPTURETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneCaptureType", NULL },
{ EXIFTAG_GAINCONTROL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GainControl", NULL },
{ EXIFTAG_GAINCONTROL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GainControl", NULL },
{ EXIFTAG_CONTRAST, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Contrast", NULL },
{ EXIFTAG_SATURATION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Saturation", NULL },
{ EXIFTAG_SHARPNESS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Sharpness", NULL },
@ -502,6 +511,82 @@ _TIFFDataSize(TIFFDataType type)
}
}
/*
* Rational2Double:
* Return size of TIFFSetGetFieldType in bytes.
*
* XXX: TIFF_RATIONAL values for FIELD_CUSTOM are stored internally as 4-byte float.
* However, some of them should be stored internally as 8-byte double.
* This is now managed by the SetGetField of the tag-definition!
*/
int
_TIFFSetGetFieldSize(TIFFSetGetFieldType setgettype)
{
switch (setgettype)
{
case TIFF_SETGET_UNDEFINED:
case TIFF_SETGET_ASCII:
case TIFF_SETGET_C0_ASCII:
case TIFF_SETGET_C16_ASCII:
case TIFF_SETGET_C32_ASCII:
case TIFF_SETGET_OTHER:
return 0;
case TIFF_SETGET_UINT8:
case TIFF_SETGET_SINT8:
case TIFF_SETGET_C0_UINT8:
case TIFF_SETGET_C0_SINT8:
case TIFF_SETGET_C16_UINT8:
case TIFF_SETGET_C16_SINT8:
case TIFF_SETGET_C32_UINT8:
case TIFF_SETGET_C32_SINT8:
return 1;
case TIFF_SETGET_UINT16:
case TIFF_SETGET_SINT16:
case TIFF_SETGET_C0_UINT16:
case TIFF_SETGET_C0_SINT16:
case TIFF_SETGET_C16_UINT16:
case TIFF_SETGET_C16_SINT16:
case TIFF_SETGET_C32_UINT16:
case TIFF_SETGET_C32_SINT16:
return 2;
case TIFF_SETGET_INT:
case TIFF_SETGET_UINT32:
case TIFF_SETGET_SINT32:
case TIFF_SETGET_FLOAT:
case TIFF_SETGET_UINT16_PAIR:
case TIFF_SETGET_C0_UINT32:
case TIFF_SETGET_C0_SINT32:
case TIFF_SETGET_C0_FLOAT:
case TIFF_SETGET_C16_UINT32:
case TIFF_SETGET_C16_SINT32:
case TIFF_SETGET_C16_FLOAT:
case TIFF_SETGET_C32_UINT32:
case TIFF_SETGET_C32_SINT32:
case TIFF_SETGET_C32_FLOAT:
return 4;
case TIFF_SETGET_UINT64:
case TIFF_SETGET_SINT64:
case TIFF_SETGET_DOUBLE:
case TIFF_SETGET_IFD8:
case TIFF_SETGET_C0_UINT64:
case TIFF_SETGET_C0_SINT64:
case TIFF_SETGET_C0_DOUBLE:
case TIFF_SETGET_C0_IFD8:
case TIFF_SETGET_C16_UINT64:
case TIFF_SETGET_C16_SINT64:
case TIFF_SETGET_C16_DOUBLE:
case TIFF_SETGET_C16_IFD8:
case TIFF_SETGET_C32_UINT64:
case TIFF_SETGET_C32_SINT64:
case TIFF_SETGET_C32_DOUBLE:
case TIFF_SETGET_C32_IFD8:
return 8;
default:
return 0;
}
} /*-- _TIFFSetGetFieldSize --- */
const TIFFField*
TIFFFindField(TIFF* tif, uint32 tag, TIFFDataType dt)
{

25
libtiff/tif_dirread.c
View File

@ -5264,7 +5264,7 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp, int recover)
assert(fip->field_readcount>=1);
assert(fip->field_passcount==0);
if (dp->tdir_count!=(uint64)fip->field_readcount)
/* corrupt file */;
/* corrupt file */;
else
{
err=TIFFReadDirEntryFloatArray(tif,dp,&data);
@ -5280,6 +5280,29 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp, int recover)
}
}
break;
/*--: Rational2Double: Extend for Double Arrays and Rational-Arrays read into Double-Arrays. */
case TIFF_SETGET_C0_DOUBLE:
{
double* data;
assert(fip->field_readcount>=1);
assert(fip->field_passcount==0);
if (dp->tdir_count!=(uint64)fip->field_readcount)
/* corrupt file */;
else
{
err=TIFFReadDirEntryDoubleArray(tif,dp,&data);
if (err==TIFFReadDirEntryErrOk)
{
int m;
m=TIFFSetField(tif,dp->tdir_tag,data);
if (data!=0)
_TIFFfree(data);
if (!m)
return(0);
}
}
}
break;
case TIFF_SETGET_C16_ASCII:
{
uint8* data;

495
libtiff/tif_dirwrite.c
View File

@ -28,6 +28,8 @@
* Directory Write Support Routines.
*/
#include "tiffiop.h"
#include <float.h> /*--: for Rational2Double */
#include <math.h> /*--: for Rational2Double */
#ifdef HAVE_IEEEFP
#define TIFFCvtNativeToIEEEFloat(tif, n, fp)
@ -154,6 +156,17 @@ static int TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFF
static int TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value);
static int TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, float* value);
static int TIFFWriteDirectoryTagCheckedSrationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, float* value);
/*--: Rational2Double: New functions to support true double-precision for custom rational tag types. */
static int TIFFWriteDirectoryTagRationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value);
static int TIFFWriteDirectoryTagSrationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value);
static int TIFFWriteDirectoryTagCheckedRationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value);
static int TIFFWriteDirectoryTagCheckedSrationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value);
void DoubleToRational(double f, uint32 *num, uint32 *denom);
void DoubleToSrational(double f, int32 *num, int32 *denom);
void DoubleToRational_direct(double value, unsigned long *num, unsigned long *denom);
void DoubleToSrational_direct(double value, long *num, long *denom);
#ifdef notdef
static int TIFFWriteDirectoryTagCheckedFloat(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, float value);
#endif
@ -796,12 +809,42 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)
goto bad;
break;
case TIFF_RATIONAL:
if (!TIFFWriteDirectoryTagRationalArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
{
/*-- Rational2Double: For Rationals evaluate "set_field_type" to determine internal storage size. */
int tv_size;
tv_size = _TIFFSetGetFieldSize(tif->tif_dir.td_customValues[m].info->set_field_type);
if (tv_size == 8) {
if (!TIFFWriteDirectoryTagRationalDoubleArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
} else {
/*-- default schould be tv_size == 4 */
if (!TIFFWriteDirectoryTagRationalArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
TIFFErrorExt(0,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
}
}
}
break;
case TIFF_SRATIONAL:
if (!TIFFWriteDirectoryTagSrationalArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
{
/*-- Rational2Double: For Rationals evaluate "set_field_type" to determine internal storage size. */
int tv_size;
tv_size = _TIFFSetGetFieldSize(tif->tif_dir.td_customValues[m].info->set_field_type);
if (tv_size == 8) {
if (!TIFFWriteDirectoryTagSrationalDoubleArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
} else {
/*-- default schould be tv_size == 4 */
if (!TIFFWriteDirectoryTagSrationalArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
goto bad;
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
TIFFErrorExt(0,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
}
}
}
break;
case TIFF_FLOAT:
if (!TIFFWriteDirectoryTagFloatArray(tif,&ndir,dir,tag,count,tif->tif_dir.td_customValues[m].value))
@ -1560,6 +1603,29 @@ TIFFWriteDirectoryTagSrationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir,
return(TIFFWriteDirectoryTagCheckedSrationalArray(tif,ndir,dir,tag,count,value));
}
/*-- Rational2Double: additional write functions */
static int
TIFFWriteDirectoryTagRationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
{
if (dir==NULL)
{
(*ndir)++;
return(1);
}
return(TIFFWriteDirectoryTagCheckedRationalDoubleArray(tif,ndir,dir,tag,count,value));
}
static int
TIFFWriteDirectoryTagSrationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
{
if (dir==NULL)
{
(*ndir)++;
return(1);
}
return(TIFFWriteDirectoryTagCheckedSrationalDoubleArray(tif,ndir,dir,tag,count,value));
}
#ifdef notdef
static int TIFFWriteDirectoryTagFloat(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, float value)
{
@ -2318,19 +2384,20 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
static int
TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value)
{
static const char module[] = "TIFFWriteDirectoryTagCheckedRational";
static const char module[] = "TIFFWriteDirectoryTagCheckedRational";
uint32 m[2];
assert(sizeof(uint32)==4);
if( value < 0 )
{
TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
return 0;
}
else if( value != value )
{
TIFFErrorExt(tif->tif_clientdata,module,"Not-a-number value is illegal");
return 0;
}
if (value < 0)
{
TIFFErrorExt(tif->tif_clientdata, module, "Negative value is illegal");
return 0;
}
else if (value != value)
{
TIFFErrorExt(tif->tif_clientdata, module, "Not-a-number value is illegal");
return 0;
}
#ifdef not_def
else if (value==0.0)
{
m[0]=0;
@ -2351,6 +2418,15 @@ TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir,
m[0]=0xFFFFFFFF;
m[1]=(uint32)(0xFFFFFFFF/value);
}
#else
/*--Rational2Double: New function also used for non-custom rational tags.
* However, could be omitted here, because TIFFWriteDirectoryTagCheckedRational() is not used by code for custom tags,
* only by code for named-tiff-tags like FIELD_RESOLUTION and FIELD_POSITION */
else {
DoubleToRational(value, &m[0], &m[1]);
}
#endif
if (tif->tif_flags&TIFF_SWAB)
{
TIFFSwabLong(&m[0]);
@ -2377,6 +2453,7 @@ TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry*
}
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
{
#ifdef not_def
if (*na<=0.0 || *na != *na)
{
nb[0]=0;
@ -2398,6 +2475,10 @@ TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry*
nb[0]=0xFFFFFFFF;
nb[1]=(uint32)((double)0xFFFFFFFF/(*na));
}
#else
/*-- Rational2Double: Also for float precision accuracy is sometimes enhanced --*/
DoubleToRational(*na, &nb[0], &nb[1]);
#endif
}
if (tif->tif_flags&TIFF_SWAB)
TIFFSwabArrayOfLong(m,count*2);
@ -2424,6 +2505,7 @@ TIFFWriteDirectoryTagCheckedSrationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry
}
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
{
#ifdef not_def
if (*na<0.0)
{
if (*na==(int32)(*na))
@ -2460,6 +2542,10 @@ TIFFWriteDirectoryTagCheckedSrationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry
nb[1]=(int32)((double)0x7FFFFFFF/(*na));
}
}
#else
/*-- Rational2Double: Also for float precision accuracy is sometimes enhanced --*/
DoubleToSrational(*na, &nb[0], &nb[1]);
#endif
}
if (tif->tif_flags&TIFF_SWAB)
TIFFSwabArrayOfLong((uint32*)m,count*2);
@ -2468,6 +2554,385 @@ TIFFWriteDirectoryTagCheckedSrationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry
return(o);
}
/*-- Rational2Double: additonal write functions for double arrays */
static int
TIFFWriteDirectoryTagCheckedRationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
{
static const char module[] = "TIFFWriteDirectoryTagCheckedRationalDoubleArray";
uint32* m;
double* na;
uint32* nb;
uint32 nc;
int o;
assert(sizeof(uint32)==4);
m=_TIFFmalloc(count*2*sizeof(uint32));
if (m==NULL)
{
TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
return(0);
}
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
{
DoubleToRational(*na, &nb[0], &nb[1]);
}
if (tif->tif_flags&TIFF_SWAB)
TIFFSwabArrayOfLong(m,count*2);
o=TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_RATIONAL,count,count*8,&m[0]);
_TIFFfree(m);
return(o);
} /*-- TIFFWriteDirectoryTagCheckedRationalDoubleArray() ------- */
static int
TIFFWriteDirectoryTagCheckedSrationalDoubleArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
{
static const char module[] = "TIFFWriteDirectoryTagCheckedSrationalDoubleArray";
int32* m;
double* na;
int32* nb;
uint32 nc;
int o;
assert(sizeof(int32)==4);
m=_TIFFmalloc(count*2*sizeof(int32));
if (m==NULL)
{
TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
return(0);
}
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
{
DoubleToSrational(*na, &nb[0], &nb[1]);
}
if (tif->tif_flags&TIFF_SWAB)
TIFFSwabArrayOfLong((uint32*)m,count*2);
o=TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SRATIONAL,count,count*8,&m[0]);
_TIFFfree(m);
return(o);
} /*--- TIFFWriteDirectoryTagCheckedSrationalDoubleArray() -------- */
void DoubleToRational_direct(double value, unsigned long *num, unsigned long *denom)
{
/*--- OLD Code for debugging and comparison ---- */
/* code merged from TIFFWriteDirectoryTagCheckedRationalArray() and TIFFWriteDirectoryTagCheckedRational() */
/* First check for zero and also check for negative numbers (which are illegal for RATIONAL)
* and also check for "not-a-number". In each case just set this to zero to support also rational-arrays.
*/
if (value<=0.0 || value != value)
{
*num=0;
*denom=1;
}
else if (value <= 0xFFFFFFFFU && (value==(double)(uint32)(value))) /* check for integer values */
{
*num=(uint32)(value);
*denom=1;
}
else if (value<1.0)
{
*num = (uint32)((value) * (double)0xFFFFFFFFU);
*denom=0xFFFFFFFFU;
}
else
{
*num=0xFFFFFFFFU;
*denom=(uint32)((double)0xFFFFFFFFU/(value));
}
} /*-- DoubleToRational_direct() -------------- */
void DoubleToSrational_direct(double value, long *num, long *denom)
{
/*--- OLD Code for debugging and comparison -- SIGNED-version ----*/
/* code was amended from original TIFFWriteDirectoryTagCheckedSrationalArray() */
/* First check for zero and also check for negative numbers (which are illegal for RATIONAL)
* and also check for "not-a-number". In each case just set this to zero to support also rational-arrays.
*/
if (value<0.0)
{
if (value==(int32)(value))
{
*num=(int32)(value);
*denom=1;
}
else if (value>-1.0)
{
*num=-(int32)((-value) * (double)0x7FFFFFFF);
*denom=0x7FFFFFFF;
}
else
{
*num=-0x7FFFFFFF;
*denom=(int32)((double)0x7FFFFFFF / (-value));
}
}
else
{
if (value==(int32)(value))
{
*num=(int32)(value);
*denom=1;
}
else if (value<1.0)
{
*num=(int32)((value) *(double)0x7FFFFFFF);
*denom=0x7FFFFFFF;
}
else
{
*num=0x7FFFFFFF;
*denom=(int32)((double)0x7FFFFFFF / (value));
}
}
} /*-- DoubleToSrational_direct() --------------*/
//#define DOUBLE2RAT_DEBUGOUTPUT
/** ----- Rational2Double: Double To Rational Conversion ----------------------------------------------------------
* There is a mathematical theorem to convert real numbers into a rational (integer fraction) number.
* This is called "continuous fraction" which uses the Euclidean algorithm to find the greatest common divisor (GCD).
* (ref. e.g. https://de.wikipedia.org/wiki/Kettenbruch or https://en.wikipedia.org/wiki/Continued_fraction
* https://en.wikipedia.org/wiki/Euclidean_algorithm)
* The following functions implement the
* - ToRationalEuclideanGCD() auxiliary function which mainly implements euclidian GCD
* - DoubleToRational() conversion function for un-signed rationals
* - DoubleToSrational() conversion function for signed rationals
------------------------------------------------------------------------------------------------------------------*/
/**---- ToRationalEuclideanGCD() -----------------------------------------
* Calculates the rational fractional of a double input value
* using the Euclidean algorithm to find the greatest common divisor (GCD)
------------------------------------------------------------------------*/
void ToRationalEuclideanGCD(double value, int blnUseSignedRange, int blnUseSmallRange, unsigned long long *ullNum, unsigned long long *ullDenom)
{
/* Internally, the integer variables can be bigger than the external ones,
* as long as the result will fit into the external variable size.
*/
unsigned long long val, numSum[3] = { 0, 1, 0 }, denomSum[3] = { 1, 0, 0 };
unsigned long long aux, bigNum, bigDenom;
unsigned long long returnLimit;
int i;
unsigned long long nMax;
double fMax;
unsigned long maxDenom;
/*-- nMax and fMax defines the initial accuracy of the starting fractional,
* or better, the highest used integer numbers used within the starting fractional (bigNum/bigDenom).
* There are two approaches, which can accidentially lead to different accuracies just depending on the value.
* Therefore, blnUseSmallRange steers this behaviour.
* For long long nMax = ((9223372036854775807-1)/2); for long nMax = ((2147483647-1)/2);
*/
if (blnUseSmallRange) {
nMax = (unsigned long long)((2147483647 - 1) / 2); /* for ULONG range */
}
else {
nMax = ((9223372036854775807 - 1) / 2); /* for ULLONG range */
}
fMax = (double)nMax;
/*-- For the Euclidean GCD define the denominator range, so that it stays within size of unsigned long variables.
* maxDenom should be LONG_MAX for negative values and ULONG_MAX for positive ones.
* Also the final returned value of ullNum and ullDenom is limited according to signed- or unsigned-range.
*/
if (blnUseSignedRange) {
maxDenom = 2147483647UL; /*LONG_MAX = 0x7FFFFFFFUL*/
returnLimit = maxDenom;
}
else {
maxDenom = 0xFFFFFFFFUL; /*ULONG_MAX = 0xFFFFFFFFUL*/
returnLimit = maxDenom;
}
/*-- First generate a rational fraction (bigNum/bigDenom) which represents the value
* as a rational number with the highest accuracy. Therefore, unsigned long long (uint64) is needed.
* This rational fraction is then reduced using the Euclidean algorithm to find the greatest common divisor (GCD).
* bigNum = big numinator of value without fraction (or cut residual fraction)
* bigDenom = big denominator of value
*-- Break-criteria so that uint64 cast to "bigNum" introduces no error and bigDenom has no overflow,
* and stop with enlargement of fraction when the double-value of it reaches an integer number without fractional part.
*/
bigDenom = 1;
while ((value != floor(value)) && (value < fMax) && (bigDenom < nMax)) {
bigDenom <<= 1;
value *= 2;
}
bigNum = (unsigned long long)value;
/*-- Start Euclidean algorithm to find the greatest common divisor (GCD) -- */
#define MAX_ITERATIONS 64
for (i = 0; i < MAX_ITERATIONS; i++) {
/* if bigDenom is not zero, calculate integer part of fraction. */
if (bigDenom == 0) {
val = 0;
if (i > 0) break; /* if bigDenom is zero, exit loop, but execute loop just once */
}
else {
val = bigNum / bigDenom;
}
/* Set bigDenom to reminder of bigNum/bigDenom and bigNum to previous denominator bigDenom. */
aux = bigNum;
bigNum = bigDenom;
bigDenom = aux % bigDenom;
/* calculate next denominator and check for its given maximum */
aux = val;
if (denomSum[1] * val + denomSum[0] >= maxDenom) {
aux = (maxDenom - denomSum[0]) / denomSum[1];
if (aux * 2 >= val || denomSum[1] >= maxDenom)
i = (MAX_ITERATIONS + 1); /* exit but execute rest of for-loop */
else
break;
}
/* calculate next numerator to numSum2 and save previous one to numSum0; numSum1 just copy of numSum2. */
numSum[2] = aux * numSum[1] + numSum[0];
numSum[0] = numSum[1];
numSum[1] = numSum[2];
/* calculate next denominator to denomSum2 and save previous one to denomSum0; denomSum1 just copy of denomSum2. */
denomSum[2] = aux * denomSum[1] + denomSum[0];
denomSum[0] = denomSum[1];
denomSum[1] = denomSum[2];
}
/*-- Check and adapt for final variable size and return values; reduces internal accuracy; denominator is kept in ULONG-range with maxDenom -- */
while (numSum[1] > returnLimit || denomSum[1] > returnLimit) {
numSum[1] = numSum[1] / 2;
denomSum[1] = denomSum[1] / 2;
}
/* return values */
*ullNum = numSum[1];
*ullDenom = denomSum[1];
} /*-- ToRationalEuclideanGCD() -------------- */
/**---- DoubleToRational() -----------------------------------------------
* Calculates the rational fractional of a double input value
* for UN-SIGNED rationals,
* using the Euclidean algorithm to find the greatest common divisor (GCD)
------------------------------------------------------------------------*/
void DoubleToRational(double value, uint32 *num, uint32 *denom)
{
/*---- UN-SIGNED RATIONAL ---- */
double dblDiff, dblDiff2;
unsigned long long ullNum, ullDenom, ullNum2, ullDenom2;
/*-- Check for negative values. If so it is an error. */
if (value < 0) {
*num = *denom = 0;
TIFFErrorExt(0, "TIFFLib: DoubeToRational()", " Negative Value for Unsigned Rational given.");
return;
}
/*-- Check for too big numbers (> ULONG_MAX) -- */
if (value > 0xFFFFFFFFUL) {
*num = 0xFFFFFFFFUL;
*denom = 0;
return;
}
/*-- Check for easy integer numbers -- */
if (value == (unsigned long)(value)) {
*num = (unsigned long)value;
*denom = 1;
return;
}
/*-- Check for too small numbers for "unsigned long" type rationals -- */
if (value < 1.0 / (double)0xFFFFFFFFUL) {
*num = 0;
*denom = 0xFFFFFFFFUL;
return;
}
/*-- There are two approaches using the Euclidean algorithm,
* which can accidentially lead to different accuracies just depending on the value.
* Try both and define which one was better.
*/
ToRationalEuclideanGCD(value, FALSE, FALSE, &ullNum, &ullDenom);
ToRationalEuclideanGCD(value, FALSE, TRUE, &ullNum2, &ullDenom2);
/*-- Double-Check, that returned values fit into ULONG :*/
if (ullNum > 0xFFFFFFFFUL || ullDenom > 0xFFFFFFFFUL || ullNum2 > 0xFFFFFFFFUL || ullDenom2 > 0xFFFFFFFFUL) {
TIFFErrorExt(0, "TIFFLib: DoubeToRational()", " Num or Denom exceeds ULONG: val=%14.6f, num=%12llu, denom=%12llu | num2=%12llu, denom2=%12llu", value, ullNum, ullDenom, ullNum2, ullDenom2);
assert(0);
}
/* Check, which one has higher accuracy and take that. */
dblDiff = fabs(value - ((double)ullNum / (double)ullDenom));
dblDiff2 = fabs(value - ((double)ullNum2 / (double)ullDenom2));
if (dblDiff < dblDiff2) {
*num = (unsigned long)ullNum;
*denom = (unsigned long)ullDenom;
}
else {
*num = (unsigned long)ullNum2;
*denom = (unsigned long)ullDenom2;
}
} /*-- DoubleToRational() -------------- */
/**---- DoubleToSrational() -----------------------------------------------
* Calculates the rational fractional of a double input value
* for SIGNED rationals,
* using the Euclidean algorithm to find the greatest common divisor (GCD)
------------------------------------------------------------------------*/
void DoubleToSrational(double value, int32 *num, int32 *denom)
{
/*---- SIGNED RATIONAL ----*/
int neg = 1;
double dblDiff, dblDiff2;
unsigned long long ullNum, ullDenom, ullNum2, ullDenom2;
/*-- Check for negative values and use then the positive one for internal calculations. */
if (value < 0) { neg = -1; value = -value; }
/*-- Check for too big numbers (> LONG_MAX) -- */
if (value > 0x7FFFFFFFL) {
*num = 0x7FFFFFFFL;
*denom = 0;
return;
}
/*-- Check for easy numbers -- */
if (value == (long)(value)) {
*num = (long)value;
*denom = 1;
return;
}
/*-- Check for too small numbers for "long" type rationals -- */
if (value < 1.0 / (double)0x7FFFFFFFL) {
*num = 0;
*denom = 0x7FFFFFFFL;
return;
}
/*-- There are two approaches using the Euclidean algorithm,
* which can accidentially lead to different accuracies just depending on the value.
* Try both and define which one was better.
* Furthermore, set behaviour of ToRationalEuclideanGCD() to the range of signed-long.
*/
ToRationalEuclideanGCD(value, TRUE, FALSE, &ullNum, &ullDenom);
ToRationalEuclideanGCD(value, TRUE, TRUE, &ullNum2, &ullDenom2);
/*-- Double-Check, that returned values fit into LONG :*/
if (ullNum > 0x7FFFFFFFL || ullDenom > 0x7FFFFFFFL || ullNum2 > 0x7FFFFFFFL || ullDenom2 > 0x7FFFFFFFL) {
TIFFErrorExt(0, "TIFFLib: DoubeToSrational()", " Num or Denom exceeds LONG: val=%14.6f, num=%12llu, denom=%12llu | num2=%12llu, denom2=%12llu", neg*value, ullNum, ullDenom, ullNum2, ullDenom2);
assert(0);
}
/* Check, which one has higher accuracy and take that. */
dblDiff = fabs(value - ((double)ullNum / (double)ullDenom));
dblDiff2 = fabs(value - ((double)ullNum2 / (double)ullDenom2));
if (dblDiff < dblDiff2) {
*num = (long)(neg * (long)ullNum);
*denom = (long)ullDenom;
}
else {
*num = (long)(neg * (long)ullNum2);
*denom = (long)ullDenom2;
}
} /*-- DoubleToSrational() --------------*/
#ifdef notdef
static int
TIFFWriteDirectoryTagCheckedFloat(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, float value)

3
libtiff/tiffiop.h
View File

@ -367,6 +367,9 @@ extern uint32 _TIFFDefaultStripSize(TIFF* tif, uint32 s);
extern void _TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th);
extern int _TIFFDataSize(TIFFDataType type);
/*--: Rational2Double: Return size of TIFFSetGetFieldType in bytes. */
extern int _TIFFSetGetFieldSize(TIFFSetGetFieldType setgettype);
extern void _TIFFsetByteArray(void**, void*, uint32);
extern void _TIFFsetString(char**, char*);
extern void _TIFFsetShortArray(uint16**, uint16*, uint32);

3
test/CMakeLists.txt
View File

@ -194,6 +194,9 @@ endif()
add_executable(custom_dir custom_dir.c)
target_link_libraries(custom_dir tiff port)
add_executable(rational_precision2double rational_precision2double.c)
target_link_libraries(rational_precision2double tiff port)
add_executable(defer_strile_loading defer_strile_loading.c)
target_link_libraries(defer_strile_loading tiff port)

4
test/Makefile.am
View File

@ -68,7 +68,7 @@ endif
# Executable programs which need to be built in order to support tests
check_PROGRAMS = \
ascii_tag long_tag short_tag strip_rw rewrite custom_dir \
defer_strile_loading defer_strile_writing testtypes \
rational_precision2double defer_strile_loading defer_strile_writing testtypes \
$(JPEG_DEPENDENT_CHECK_PROG)
# Test scripts to execute
@ -210,6 +210,8 @@ raw_decode_SOURCES = raw_decode.c
raw_decode_LDADD = $(LIBTIFF)
custom_dir_SOURCES = custom_dir.c
custom_dir_LDADD = $(LIBTIFF)
rational_precision2double_SOURCES = rational_precision2double.c
rational_precision2double_LDADD = $(LIBTIFF)
defer_strile_loading_SOURCES = defer_strile_loading.c
defer_strile_loading_LDADD = $(LIBTIFF)
defer_strile_writing_SOURCES = defer_strile_writing.c

990
test/rational_precision2double.c Normal file
View File

@ -0,0 +1,990 @@
/*
* Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
* that (i) the above copyright notices and this permission notice appear in
* all copies of the software and related documentation, and (ii) the names of
* Sam Leffler and Silicon Graphics may not be used in any advertising or
* publicity relating to the software without the specific, prior written
* permission of Sam Leffler and Silicon Graphics.
*
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
*
* IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
* ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
* OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
* WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
/*
* TIFF Library
*
* -- Module copied from custom_dir.c --
*=========== Purpose ===================================================================================
* Extended and amended version for testing the TIFFSetField() / and TIFFGetField()- interface
* for custom fields of type RATIONAL when the TIFFLib internal precision is updated from FLOAT to DOUBLE!
* The external interface of already defined tags schould be kept.
* This is verified for some of those tags with this test.
*
*/
#define FOR_AUTO_TESTING
#ifdef FOR_AUTO_TESTING
/* Only for automake and CMake infrastructure the test should:
a.) delete any written testfiles when test passed (otherwise autotest will fail)
b.) goto failure, if any failure is detected, which is not necessary when test is initiated manually for debugging
*/
#define GOTOFAILURE goto failure;
#else
#define GOTOFAILURE
#endif
#pragma warning( disable : 4101)
#include "tif_config.h"
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include "tiffio.h"
#include "tiffiop.h"
#include "tif_dir.h"
#include "tifftest.h"
#include "tif_dirwrite.c"
int write_test_tiff(TIFF *tif, const char *filenameRead, int blnAllCustomTags);
#define SPP 3 /* Samples per pixel */
const uint16 width = 1;
const uint16 length = 1;
const uint16 bps = 8;
const uint16 photometric = PHOTOMETRIC_RGB;
const uint16 rows_per_strip = 1;
const uint16 planarconfig = PLANARCONFIG_CONTIG;
/*-- Additional custom TIFF tags for testing of Rational2Double precision --*/
#define TIFFTAG_RATIONAL_DOUBLE 60000
#define TIFFTAG_SRATIONAL_DOUBLE 60001
#define TIFFTAG_RATIONAL_C0_DOUBLE 60002
#define TIFFTAG_SRATIONAL_C16_DOUBLE 60003
/*--- TIFFField Definition ---
field_tag: the tag number. For instance 277 for the SamplesPerPixel tag. Builtin tags will generally have a #define in tiff.h for each known tag.
field_readcount: The number of values which should be read. The special value TIFF_VARIABLE (-1) indicates that a variable number of values may be read. The special value TIFFTAG_SPP (-2) indicates that there should be one value for each sample as defined by TIFFTAG_SAMPLESPERPIXEL. The special value TIFF_VARIABLE2 (-3) is presumably similar to TIFF_VARIABLE though I am not sure what the distinction in behaviour is. This field is TIFF_VARIABLE for variable length ascii fields.
field_writecount: The number of values which should be written. Generally the same as field_readcount. A few built-in exceptions exist, but I haven't analysed why they differ.
field_type: Type of the field. One of TIFF_BYTE, TIFF_ASCII, TIFF_SHORT, TIFF_LONG, TIFF_RATIONAL, TIFF_SBYTE, TIFF_UNDEFINED, TIFF_SSHORT, TIFF_SLONG, TIFF_SRATIONAL, TIFF_FLOAT, TIFF_DOUBLE or TIFF_IFD. Note that some fields can support more than one type (for instance short and long). These fields should have multiple TIFFFieldInfos.
reserved:
set_field_type: TIFF_SETGET_DOUBLE
get_field_type: - not used -
field_bit: Built-in tags stored in special fields in the TIFF structure have assigned field numbers to distinguish them (ie. FIELD_SAMPLESPERPIXEL). New tags should generally just use FIELD_CUSTOM indicating they are stored in the generic tag list.
field_oktochange: TRUE if it is OK to change this tag value while an image is being written. FALSE for stuff that must be set once and then left unchanged (like ImageWidth, or PhotometricInterpretation for instance).
field_passcount: If TRUE, then the count value must be passed in TIFFSetField(), and TIFFGetField(), otherwise the count is not required. This should generally be TRUE for non-ascii variable count tags unless the count is implicit (such as with the colormap).
field_name: A name for the tag. Normally mixed case (studly caps) like "StripByteCounts" and relatively short.
*/
static const TIFFField
tifFieldInfo[] = {
{ TIFFTAG_RATIONAL_DOUBLE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "Rational2Double_U_Double", NULL },
{ TIFFTAG_SRATIONAL_DOUBLE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "Rational2Double_S_Double", NULL },
{ TIFFTAG_RATIONAL_C0_DOUBLE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "Rational2Double_C0", NULL },
{ TIFFTAG_SRATIONAL_C16_DOUBLE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "Rational2Double_S_C16", NULL },
};
#define N(a) (sizeof (a) / sizeof (a[0]))
/*--- Add aditional Rational-Double Tags to TIFF
ref: html\addingtags.html but with new function _TIFFMergeFields().
---*/
/* In libtiff 3.6.0 a new mechanism was introduced allowing libtiff to read unrecognised tags automatically.
When an unknown tags is encountered, it is automatically internally defined with a default name and a type derived from the tag value in the file.
Applications only need to predefine application specific tags if they need to be able to set them in a file, or if particular calling conventions
are desired for TIFFSetField() and TIFFGetField().
When tags are autodefined like this the field_readcount and field_writecount values are always TIFF_VARIABLE.
The field_passcount is always TRUE, and the field_bit is FIELD_CUSTOM. The field name will be "Tag %d" where the %d is the tag number.
*/
/*The tags need to be defined for each TIFF file opened - and when reading they should be defined before the tags of the file are read,
yet a valid TIFF * is needed to merge the tags against. In order to get them registered at the appropriate part of the setup process,
it is necessary to register our merge function as an extender callback with libtiff. This is done with TIFFSetTagExtender().
We also keep track of the previous tag extender (if any) so that we can call it from our extender allowing a chain of customizations to take effect.
*/
static TIFFExtendProc _ParentExtender = NULL;
static void _XTIFFDefaultDirectory(TIFF *tif);
static
void _XTIFFInitialize(void)
{
static int first_time=1;
if (! first_time) return; /* Been there. Done that. */
first_time = 0;
/* Grab the inherited method and install */
_ParentExtender = TIFFSetTagExtender(_XTIFFDefaultDirectory);
}
/* The extender callback is looks like this.
It merges in our new fields and then calls the next extender if there is one in effect.
*/
static void
_XTIFFDefaultDirectory(TIFF *tif)
{
uint32 n, nadded;
/* Install the extended Tag field info */
n = N(tifFieldInfo);
//_TIFFMergeFields(tif, const TIFFField info[], uint32 n);
nadded = _TIFFMergeFields(tif, tifFieldInfo, n);
/* Since an XTIFF client module may have overridden
* the default directory method, we call it now to
* allow it to set up the rest of its own methods.
*/
if (_ParentExtender)
(*_ParentExtender)(tif);
}
int
main()
{
static const char filenameClassicTiff[] = "rationalPrecision2Double.tif";
static const char filenameBigTiff[] = "rationalPrecision2Double_Big.tif";
TIFF *tif;
int ret;
int errorNo;
/*-- Initialize TIFF-Extender to add additonal TIFF-Tags --*/
_XTIFFInitialize();
fprintf(stderr, "==== Test if Set()/Get() interface for some custom rational tags behave as before change. ====\n");
/* --- Test with Classic-TIFF ---*/
/* delete file, if exists */
ret = unlink(filenameClassicTiff);
errorNo = errno;
if (ret != 0 && errno != ENOENT) {
fprintf(stderr, "Can't delete test TIFF file %s.\n", filenameClassicTiff);
}
/* We write the main directory as a simple image. */
tif = TIFFOpen(filenameClassicTiff, "w+");
if (!tif) {
fprintf(stderr, "Can't create test TIFF file %s.\n", filenameClassicTiff);
return 1;
}
fprintf(stderr, "-------- Test with ClassicTIFF started ----------\n");
ret = write_test_tiff(tif, filenameClassicTiff, FALSE);
if (ret > 0) return(ret);
/*--- Test with BIG-TIFF ---*/
/* delete file, if exists */
ret = unlink(filenameBigTiff);
if (ret != 0 && errno != ENOENT) {
fprintf(stderr, "Can't delete test TIFF file %s.\n", filenameBigTiff);
}
tif = TIFFOpen(filenameBigTiff, "w8");
if (!tif) {
fprintf(stderr, "Can't create test TIFF file %s.\n", filenameBigTiff);
return 1;
}
fprintf(stderr, "\n-------- Test with BigTIFF started ----------\n");
ret = write_test_tiff(tif, filenameBigTiff, FALSE);
if (ret > 0) return(ret);
fprintf(stderr, "\n\n==== Test automatically, if all custom rational tags are written/read correctly. ====\n");
/* --- Test with Classic-TIFF ---*/
/* delete file, if exists */
ret = unlink(filenameClassicTiff);
errorNo = errno;
if (ret != 0 && errno != ENOENT) {
fprintf(stderr, "Can't delete test TIFF file %s.\n", filenameClassicTiff);
}
/* We write the main directory as a simple image. */
tif = TIFFOpen(filenameClassicTiff, "w+");
if (!tif) {
fprintf(stderr, "Can't create test TIFF file %s.\n", filenameClassicTiff);
return 1;
}
fprintf(stderr, "-------- Test with ClassicTIFF started ----------\n");
ret = write_test_tiff(tif, filenameClassicTiff, TRUE);
if (ret > 0) return(ret);
/*--- Test with BIG-TIFF ---*/
/* delete file, if exists */
ret = unlink(filenameBigTiff);
if (ret != 0 && errno != ENOENT) {
fprintf(stderr, "Can't delete test TIFF file %s.\n", filenameBigTiff);
}
tif = TIFFOpen(filenameBigTiff, "w8");
if (!tif) {
fprintf(stderr, "Can't create test TIFF file %s.\n", filenameBigTiff);
return 1;
}
fprintf(stderr, "\n-------- Test with BigTIFF started ----------\n");
ret = write_test_tiff(tif, filenameBigTiff, TRUE);
return(ret);
} /* main() */
int
write_test_tiff(TIFF* tif, const char* filenameRead, int blnAllCustomTags) {
unsigned char buf[SPP] = {0, 127, 255};
/*-- Additional variables --*/
int retCode, retCode2;
unsigned char* pGpsVersion;
char auxStr[200];
float auxFloat = 0.0f;
double auxDouble = 0.0;
uint16 auxUint16 = 0;
uint32 auxUint32 = 0;
long auxLong = 0;
void* pVoid;
int blnIsRational2Double;
int i, j;
long nTags;
const TIFFFieldArray* tFieldArray;
const TIFFField** tifFields; /* actual field info */
unsigned long tTag;
TIFFDataType tType;
short tWriteCount;
TIFFSetGetFieldType tSetFieldType;
unsigned short tFieldBit;
const TIFFField *fip;
char* tFieldName;
#define STRSIZE 1000
#define N_SIZE 200
#define VARIABLE_ARRAY_SIZE 6
/* -- Test data for writing -- */
char auxCharArrayW[N_SIZE];
short auxShortArrayW[N_SIZE];
long auxLongArrayW[N_SIZE];
float auxFloatArrayW[N_SIZE];
double auxDoubleArrayW[N_SIZE];
char auxTextArrayW[N_SIZE][STRSIZE];
float auxFloatArrayN1[3] = {1.0f / 7.0f, 61.23456789012345f, 62.3f};
float auxFloatArrayResolutions[4] = {5.456789f, 6.666666f, 0.0033f, 5.0f / 213.0f};
/* -- Variables for reading -- */
uint16 count16 = 0;
union {
long Long;
short Short1;
short Short2[2];
char Char[4];
} auxLongUnion;
union {
double dbl;
float flt1;
float flt2;
} auxDblUnion;
float* pFloat;
void* pVoidArray;
float* pFloatArray;
double* pDoubleArray;
char* pAscii;
char auxCharArray[2 * STRSIZE];
short auxShortArray[2 * N_SIZE];
long auxLongArray[2 * N_SIZE];
float auxFloatArray[2 * N_SIZE];
double auxDoubleArray[2 * N_SIZE];
double dblDiff, dblDiffLimit;
float fltDiff, fltDiffLimit;
#define RATIONAL_EPS (1.0/30000.0) /* reduced difference of rational values, approx 3.3e-5 */
/*-- Fill test data arrays for writing ----------- */
for (i = 0; i < N_SIZE; i++) {
sprintf(auxTextArrayW[i], "N%d-String-%d_tttttttttttttttttttttttttttttx", i, i);
}
for (i = 0; i < N_SIZE; i++) {
auxCharArrayW[i] = (char)(i + 1);
}
for (i = 0; i < N_SIZE; i++) {
auxShortArrayW[i] = (short)(i + 1) * 7;
}
for (i = 0; i < N_SIZE; i++) {
auxLongArrayW[i] = (i + 1) * 133;
}
for (i = 0; i < N_SIZE; i++) {
auxFloatArrayW[i] = (float)((i + 1) * 133) / 3.3f;
}
for (i = 0; i < N_SIZE; i++) {
auxDoubleArrayW[i] = (double)((i + 1) * 3689) / 4.5697;
}
/*-- Setup standard tags of a simple tiff file --*/
if (!TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width)) {
fprintf(stderr, "Can't set ImageWidth tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_IMAGELENGTH, length)) {
fprintf(stderr, "Can't set ImageLength tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps)) {
fprintf(stderr, "Can't set BitsPerSample tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, SPP)) {
fprintf(stderr, "Can't set SamplesPerPixel tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rows_per_strip)) {
fprintf(stderr, "Can't set SamplesPerPixel tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_PLANARCONFIG, planarconfig)) {
fprintf(stderr, "Can't set PlanarConfiguration tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, photometric)) {
fprintf(stderr, "Can't set PhotometricInterpretation tag.\n");
goto failure;
}
/*--- Standard tags with TIFF_RATIONAL and TIFF_SETGET_DOUBLE to TIFF_SETGET_FLOAT change. ---
* They can be written either using float or double but have to be read using float.
-------------------------------------------------------------------------------------------- */
if (!TIFFSetField(tif, TIFFTAG_XRESOLUTION, auxFloatArrayResolutions[0])) {
fprintf(stderr, "Can't set TIFFTAG_XRESOLUTION tag.\n");
goto failure;
}
/* Test here the double input possibility */
if (!TIFFSetField(tif, TIFFTAG_YRESOLUTION, (double)auxFloatArrayResolutions[1])) {
fprintf(stderr, "Can't set TIFFTAG_YRESOLUTION tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_XPOSITION, auxFloatArrayResolutions[2])) {
fprintf(stderr, "Can't set TIFFTAG_XPOSITION tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_YPOSITION, auxFloatArrayResolutions[3])) {
fprintf(stderr, "Can't set TIFFTAG_YPOSITION tag.\n");
goto failure;
}
/*--- Some additional FIELD_CUSTOM tags to check standard interface ---*/
/*- TIFFTAG_INKSET is a SHORT parameter (TIFF_SHORT, TIFF_SETGET_UINT16) with field_bit=FIELD_CUSTOM !! -*/
if (!TIFFSetField(tif, TIFFTAG_INKSET, 34)) {
fprintf(stderr, "Can't set TIFFTAG_INKSET tag.\n");
goto failure;
}
/*- TIFFTAG_PIXAR_FOVCOT is a FLOAT parameter ( TIFF_FLOAT, TIFF_SETGET_FLOAT) with field_bit=FIELD_CUSTOM !! -*/
/* - can be written with Double but has to be read with float parameter */
#define PIXAR_FOVCOT_VAL 5.123456789123456789
auxFloat = (float)PIXAR_FOVCOT_VAL;
/* if (!TIFFSetField(tif, TIFFTAG_PIXAR_FOVCOT, auxFloat )) {
fprintf (stderr, "Can't set TIFFTAG_PIXAR_FOVCOT tag.\n");
goto failure;
}
*/
auxDouble = (double)PIXAR_FOVCOT_VAL;
if (!TIFFSetField(tif, TIFFTAG_PIXAR_FOVCOT, auxDouble)) {
fprintf(stderr, "Can't set TIFFTAG_PIXAR_FOVCOT tag.\n");
goto failure;
}
/*- TIFFTAG_STONITS is a DOUBLE parameter (TIFF_DOUBLE, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM!
*-- Unfortunately, TIFF_SETGET_DOUBLE is used for TIFF_RATIONAL but those have to be read with FLOAT !!!
* Only TIFFTAG_STONITS is a TIFF_DOUBLE, which has to be read as DOUBLE!!
*/
#define STONITS_VAL 6.123456789123456789
auxDouble = STONITS_VAL;
auxFloat = (float)auxDouble;
if (!TIFFSetField(tif, TIFFTAG_STONITS, auxDouble)) {
fprintf(stderr, "Can't set TIFFTAG_STONITS tag.\n");
goto failure;
}
/*-- Additional tags to check Rational standard tags, which are also defined with field_bit=FIELD_CUSTOM */
/*
The following standard tags have field_type = TIFF_RATIONAL with field_bit=FIELD_CUSTOM:
TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE
and with Signed Rational:
TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_DOUBLE
Due to the fact that TIFFSetField() and TIFFGetField() interface is using va_args, variable promotion is applied,
which means:
If the actual argument is of type float, it is promoted to type double when function is to be made.
- Any signed or unsigned char, short, enumerated type, or bit field is converted to either a signed or an unsigned int
using integral promotion.
- Any argument of class type is passed by value as a data structure; the copy is created by binary copying instead
of by invoking the class’s copy constructor (if one exists).
So, if your argument types are of float type, you should expect the argument retrieved to be of type double
and it is char or short, you should expect it to be signed or unsigned int. Otherwise, the code will give you wrong results.
*/
if (!blnAllCustomTags) {
/*--- TEST: First tag is written with FLOAT and second tag is written with DOUBLE parameter ---*/
/*- TIFFTAG_SHADOWSCALE is a Rational parameter (TIFF_RATIONAL, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM! -*/
#define SHADOWSCALE_VAL 15.123456789123456789
auxFloat = (float)SHADOWSCALE_VAL;
if (!TIFFSetField(tif, TIFFTAG_SHADOWSCALE, auxFloat)) {
fprintf(stderr, "Can't set TIFFTAG_SHADOWSCALE tag.\n");
goto failure;
}
/*- TIFFTAG_BESTQUALITYSCALE is a Rational parameter (TIFF_RATIONAL, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM! -*/
#define BESTQUALITYSCALE_VAL 17.123456789123456789
auxDouble = BESTQUALITYSCALE_VAL;
if (!TIFFSetField(tif, TIFFTAG_BESTQUALITYSCALE, auxDouble)) {
fprintf(stderr, "Can't set TIFFTAG_BESTQUALITYSCALE tag.\n");
goto failure;
}
/*- TIFFTAG_BASELINEEXPOSURE is a Rational parameter (TIFF_SRATIONAL, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM! -*/
#define BASELINEEXPOSURE_VAL (-3.14159265358979323846)
/*
fprintf(stderr, "(-3.14159265358979323846) as float= %.18f, double=%.18f\n", (float)BASELINEEXPOSURE_VAL, (double)BASELINEEXPOSURE_VAL, BASELINEEXPOSURE_VAL);
fprintf(stderr, "(-3.141592742098056) as float= %.18f, double=%.18f\n", (float)(-3.141592742098056), (double)(-3.141592742098056));
*/
auxDouble = BASELINEEXPOSURE_VAL;
if (!TIFFSetField(tif, TIFFTAG_BASELINEEXPOSURE, auxDouble)) {
fprintf(stderr, "Can't set TIFFTAG_BASELINEEXPOSURE tag.\n");
goto failure;
}
/*--- For static or variable ARRAYs the case is different ---*/
/*- Variable Array: TIFFTAG_DECODE is a SRATIONAL parameter TIFF_SETGET_C16_FLOAT type FIELD_CUSTOM with passcount=1 and variable length of array. */
if (!TIFFSetField(tif, TIFFTAG_DECODE, 3, auxFloatArrayN1)) { /* for TIFF_SETGET_C16_DOUBLE */
fprintf(stderr, "Can't set TIFFTAG_DECODE tag.\n");
goto failure;
}
/*- Varable Array: TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT */
if (!TIFFSetField(tif, TIFFTAG_BLACKLEVEL, 3, auxFloatArrayN1)) { /* for TIFF_SETGET_C16_FLOAT */
fprintf(stderr, "Can't set TIFFTAG_BLACKLEVEL tag.\n");
goto failure;
}
/*-- Check, if the TiffLibrary is compiled with the new interface with Rational2Double or still uses the old definitions. */
/* tags to check: TIFFTAG_BESTQUALITYSCALE, TIFFTAG_BASELINENOISE, TIFFTAG_BASELINESHARPNESS, */
fip = TIFFFindField(tif, TIFFTAG_BESTQUALITYSCALE, TIFF_ANY);
tSetFieldType = fip->set_field_type;
if (tSetFieldType == TIFF_SETGET_DOUBLE)
blnIsRational2Double = FALSE;
else
blnIsRational2Double = TRUE;
/*--- Write now additional Rational2Double test tags ---*/
/*--- However, this additional tags are only written as Double correctly,
if blnIsRational2Double is defined!
------------------------------------------------------*/
if (blnIsRational2Double) {
if (!TIFFSetField(tif, TIFFTAG_RATIONAL_DOUBLE, auxDoubleArrayW[100])) {
fprintf(stderr, "Can't set TIFFTAG_RATIONAL_DOUBLE tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_SRATIONAL_DOUBLE, (-1.0 * auxDoubleArrayW[101]))) {
fprintf(stderr, "Can't set TIFFTAG_SRATIONAL_DOUBLE tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_RATIONAL_C0_DOUBLE, &auxDoubleArrayW[110])) {
fprintf(stderr, "Can't set TIFFTAG_RATIONAL_C0_DOUBLE tag.\n");
goto failure;
}
if (!TIFFSetField(tif, TIFFTAG_SRATIONAL_C16_DOUBLE, 2, &auxDoubleArrayW[120])) {
fprintf(stderr, "Can't set TIFFTAG_SRATIONAL_C16_DOUBLE tag.\n");
goto failure;
}
}
} else { /* blnAllCustomTags */
/*==== Automatically check all custom rational tags == WRITING ===*/
/*-- Get array, where TIFF tag fields are defined --*/
tFieldArray = _TIFFGetFields();
nTags = tFieldArray->count;
for (i = 0; i < nTags; i++) {
tTag = tFieldArray->fields[i].field_tag;
tType = tFieldArray->fields[i].field_type; /* e.g. TIFF_RATIONAL */
tWriteCount = tFieldArray->fields[i].field_writecount;
tSetFieldType = tFieldArray->fields[i].set_field_type; /* e.g. TIFF_SETGET_C0_FLOAT */
tFieldBit = tFieldArray->fields[i].field_bit;
tFieldName = tFieldArray->fields[i].field_name;
pVoid = NULL;
if (tType == TIFF_RATIONAL && tFieldBit == FIELD_CUSTOM) {
/*-- dependent on set_field_type write value --*/
switch (tSetFieldType) {
case TIFF_SETGET_FLOAT:
case TIFF_SETGET_DOUBLE:
if (tWriteCount == 1) {
/*-- All single values can be written with float or double parameter. Only value range should be in line. */
if (!TIFFSetField(tif, tTag, auxDoubleArrayW[i])) {
fprintf(stderr, "Can't write %s\n", tFieldArray->fields[i].field_name);
goto failure;
}
} else {
fprintf(stderr, "WriteCount for .set_field_type %d should be 1! %s\n", tSetFieldType, tFieldArray->fields[i].field_name);
}
break;
case TIFF_SETGET_C0_FLOAT:
case TIFF_SETGET_C0_DOUBLE:
case TIFF_SETGET_C16_FLOAT:
case TIFF_SETGET_C16_DOUBLE:
case TIFF_SETGET_C32_FLOAT:
case TIFF_SETGET_C32_DOUBLE:
/* _Cxx_ just defines the size of the count parameter for the array as C0=char, C16=short or C32=long */
/*-- Check, if it is a single parameter, a fixed array or a variable array */
if (tWriteCount == 1) {
fprintf(stderr, "WriteCount for .set_field_type %d should be -1 or greather than 1! %s\n", tSetFieldType, tFieldArray->fields[i].field_name);
} else {
/*-- Either fix or variable array --*/
/* For arrays, distinguishing between float or double is essential, even for writing */
if (tSetFieldType == TIFF_SETGET_C0_FLOAT || tSetFieldType == TIFF_SETGET_C16_FLOAT || tSetFieldType == TIFF_SETGET_C32_FLOAT)
pVoid = &auxFloatArrayW[i]; else pVoid = &auxDoubleArrayW[i];
/* Now decide between fixed or variable array */
if (tWriteCount > 1) {
/* fixed array with needed arraysize defined in .field_writecount */
if (!TIFFSetField(tif, tTag, pVoid)) {
fprintf(stderr, "Can't write %s\n", tFieldArray->fields[i].field_name);
goto failure;
}
} else {
/* special treatment of variable array */
/* for test, use always arraysize of VARIABLE_ARRAY_SIZE */
if (!TIFFSetField(tif, tTag, VARIABLE_ARRAY_SIZE, pVoid)) {
fprintf(stderr, "Can't write %s\n", tFieldArray->fields[i].field_name);
goto failure;
}
}
}
break;
default:
fprintf(stderr, "SetFieldType %d not defined within writing switch for %s.\n", tSetFieldType, tFieldName);
}; /*-- switch() --*/
} /* if () */
} /*-- for() --*/
} /* blnAllCustomTags */ /*==== END END - Automatically check all custom rational tags == WRITING END ===*/
/*-- Write dummy pixel data. --*/
if (!TIFFWriteScanline(tif, buf, 0, 0) < 0) {
fprintf (stderr, "Can't write image data.\n");
goto failure;
}
/*-- Write directory to file --*/
/* Always WriteDirectory before using/creating another directory. */
/* Not necessary before TIFFClose(), however, TIFFClose() uses TIFFReWriteDirectory(), which forces directory to be written at another location. */
retCode = TIFFWriteDirectory(tif);
/*-- Write File to disk and close file --*/
/* TIFFClose() uses TIFFReWriteDirectory(), which forces directory to be written at another location. */
/* Therefore, better use TIFFWriteDirectory() before. */
TIFFClose(tif);
fprintf (stderr, "-------- Continue Test ---------- reading ...\n");
/*========================= READING ============= READING ========================================*/
/* Ok, now test whether we can read written values in the EXIF directory. */
tif = TIFFOpen(filenameRead, "r");
/*-- Read some parameters out of the main directory --*/
/*-- IMAGEWIDTH and -LENGTH are defined as TIFF_SETGET_UINT32 */
retCode = TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &auxUint32 );
if (auxUint32 != width) {
fprintf (stderr, "Read value of IMAGEWIDTH %d differs from set value %d\n", auxUint32, width);
GOTOFAILURE
}
retCode = TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &auxUint32 );
if (auxUint32 != width) {
fprintf (stderr, "Read value of TIFFTAG_IMAGELENGTH %d differs from set value %d\n", auxUint32, length);
GOTOFAILURE
}
/*--- Standard tags with TIFF_RATIONAL and TIFF_SETGET_DOUBLE to TIFF_SETGET_FLOAT change. ---
* They can be written either using float or double but have to be read using float.
-------------------------------------------------------------------------------------------- */
dblDiffLimit = RATIONAL_EPS;
retCode = TIFFGetField(tif, TIFFTAG_XRESOLUTION, &auxFloat);
dblDiff = auxFloat - auxFloatArrayResolutions[0];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_XRESOLUTION %f differs from set value %f\n", auxFloat, auxFloatArrayResolutions[0]);
GOTOFAILURE
}
retCode = TIFFGetField(tif, TIFFTAG_YRESOLUTION, &auxFloat);
dblDiff = auxFloat - auxFloatArrayResolutions[1];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_YRESOLUTION %f differs from set value %f\n", auxFloat, auxFloatArrayResolutions[1]);
GOTOFAILURE
}
retCode = TIFFGetField(tif, TIFFTAG_XPOSITION, &auxFloat);
dblDiff = auxFloat - auxFloatArrayResolutions[2];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_XPOSITION %f differs from set value %f\n", auxFloat, auxFloatArrayResolutions[2]);
GOTOFAILURE
}
retCode = TIFFGetField(tif, TIFFTAG_YPOSITION, &auxFloat);
dblDiff = auxFloat - auxFloatArrayResolutions[3];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_YPOSITION %f differs from set value %f\n", auxFloat, auxFloatArrayResolutions[3]);
GOTOFAILURE
}
/*- TIFFTAG_INKSET is a SHORT parameter (TIFF_SHORT, TIFF_SETGET_UINT16) with field_bit=FIELD_CUSTOM !! -*/
retCode = TIFFGetField(tif, TIFFTAG_INKSET, &auxUint16);
if (auxUint16 != 34) {
fprintf(stderr, "Read value of TIFFTAG_PIXAR_FOVCOT %d differs from set value %d\n", auxUint16, TIFFTAG_INKSET);
GOTOFAILURE
}
/*- TIFFTAG_PIXAR_FOVCOT is a FLOAT parameter ( TIFF_FLOAT, TIFF_SETGET_FLOAT) with field_bit=FIELD_CUSTOM !! -*/
/* - was written with Double but has to be read with Float */
retCode = TIFFGetField(tif, TIFFTAG_PIXAR_FOVCOT, &auxFloat );
if (auxFloat != (float)PIXAR_FOVCOT_VAL) {
fprintf (stderr, "Read value of TIFFTAG_PIXAR_FOVCOT %f differs from set value %f\n", auxFloat, PIXAR_FOVCOT_VAL);
GOTOFAILURE
}
/*- TIFFTAG_STONITS is a DOUBLE parameter (TIFF_DOUBLE, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM!! -*/
retCode = TIFFGetField(tif, TIFFTAG_STONITS, &auxDouble);
if (auxDouble != (double)STONITS_VAL) {
fprintf(stderr, "Read value of TIFFTAG_STONITS %f differs from set value %f\n", auxDouble, STONITS_VAL);
GOTOFAILURE
}
/*-- Check, if the TiffLibrary is compiled with the new interface with Rational2Double or still uses the old definitions. */
/* tags to check: TIFFTAG_BESTQUALITYSCALE, TIFFTAG_BASELINENOISE, TIFFTAG_BASELINESHARPNESS, */
fip = TIFFFindField(tif, TIFFTAG_BESTQUALITYSCALE, TIFF_ANY);
tSetFieldType = fip->set_field_type;
if (tSetFieldType == TIFF_SETGET_DOUBLE)
blnIsRational2Double = FALSE;
else
blnIsRational2Double = TRUE;
if (!blnAllCustomTags) {
/*- TIFFTAG_BESTQUALITYSCALE is a Rational parameter (TIFF_RATIONAL, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM!
and written with double parameter -*/
/*- Read into a union to test the correct precision (float or double) returned.
* Float-parameter should be correct, but double-parameter should give a wrong value
*/
auxDblUnion.dbl = 0;
retCode = TIFFGetField(tif, TIFFTAG_BESTQUALITYSCALE, &auxDblUnion.dbl);
dblDiffLimit = RATIONAL_EPS * (double)BESTQUALITYSCALE_VAL;
dblDiff = auxDblUnion.dbl - (double)BESTQUALITYSCALE_VAL;
fltDiff = auxDblUnion.flt1 - (float)BESTQUALITYSCALE_VAL;
if (!((fabs(dblDiff) > fabs(dblDiffLimit)) && !(fabs(fltDiff) > fabs(dblDiffLimit)))) {
fprintf(stderr, "Float-Read value of TIFFTAG_BESTQUALITYSCALE %.12f differs from set value %.12f too much,\n", auxDblUnion.flt1, BESTQUALITYSCALE_VAL);
fprintf(stderr, "whereas Double-Read value of TIFFTAG_BESTQUALITYSCALE %.12f is nearly equal to set value %.12f\n", auxDblUnion.dbl, BESTQUALITYSCALE_VAL);
GOTOFAILURE
}
/*--- Now the same for a Signed Rational ---*/
/*- TIFFTAG_BASELINEEXPOSURE is a Rational parameter (TIFF_SRATIONAL, TIFF_SETGET_DOUBLE) with field_bit=FIELD_CUSTOM! -
and written with double parameter - */
/*- Read into a union to test the correct precision (float or double) returned.
* Float-parameter should be correct, but double-parameter should give a wrong value
*/
auxDblUnion.dbl = 0;
retCode = TIFFGetField(tif, TIFFTAG_BASELINEEXPOSURE, &auxDblUnion.dbl);
dblDiffLimit = RATIONAL_EPS * (double)BASELINEEXPOSURE_VAL;
dblDiff = auxDblUnion.dbl - (double)BASELINEEXPOSURE_VAL;
fltDiff = auxDblUnion.flt1 - (float)BASELINEEXPOSURE_VAL;
if (!((fabs(dblDiff) > fabs(dblDiffLimit)) && !(fabs(fltDiff) > fabs(dblDiffLimit)))) {
fprintf(stderr, "Float-Read value of TIFFTAG_BASELINEEXPOSURE %.12f differs from set value %.12f too much,\n", auxDblUnion.flt1, BASELINEEXPOSURE_VAL);
fprintf(stderr, "whereas Double-Read value of TIFFTAG_BESTQUALITYSCALE %.12f is nearly equal to set value %.12f\n", auxDblUnion.dbl, BASELINEEXPOSURE_VAL);
GOTOFAILURE
}
/*- Variable Array: TIFFTAG_DECODE is a SRATIONAL parameter TIFF_SETGET_C16_FLOAT type FIELD_CUSTOM with passcount=1 and variable length of array. */
retCode = TIFFGetField(tif, TIFFTAG_DECODE, &count16, &pVoidArray);
retCode = TIFFGetField(tif, TIFFTAG_DECODE, &count16, &pFloatArray);
/*- pVoidArray points to a Tiff-internal temporary memorypart. Thus, contents needs to be saved. */
memcpy(&auxFloatArray, pVoidArray, (count16 * sizeof(auxFloatArray[0])));
for (i = 0; i < count16; i++) {
dblDiffLimit = RATIONAL_EPS * auxFloatArrayN1[i];
dblDiff = auxFloatArray[i] - auxFloatArrayN1[i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value %d of TIFFTAG_DECODE Array %f differs from set value %f\n", i, auxFloatArray[i], auxFloatArrayN1[i]);
GOTOFAILURE
}
}
retCode = TIFFGetField(tif, TIFFTAG_BLACKLEVEL, &count16, &pVoidArray);
/*- pVoidArray points to a Tiff-internal temporary memorypart. Thus, contents needs to be saved. */
memcpy(&auxFloatArray, pVoidArray, (count16 * sizeof(auxFloatArray[0])));
for (i = 0; i < count16; i++) {
dblDiffLimit = RATIONAL_EPS * auxFloatArrayN1[i];
dblDiff = auxFloatArray[i] - auxFloatArrayN1[i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value %d of TIFFTAG_BLACKLEVEL Array %f differs from set value %f\n", i, auxFloatArray[i], auxFloatArrayN1[i]);
GOTOFAILURE
}
}
/*--- Read now additional Rational2Double test tags ---
This should be now with nearly double precision
However, this additional tags are only read as Double,
if blnIsRational2Double is defined!
------------------------------------------------------*/
if (blnIsRational2Double) {
auxDblUnion.dbl = 0;
retCode = TIFFGetField(tif, TIFFTAG_RATIONAL_DOUBLE, &auxDblUnion.dbl);
if (!retCode) { fprintf(stderr, "Can't read %s\n", "TIFFTAG_RATIONAL_DOUBLE"); GOTOFAILURE }
dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[100];
dblDiff = auxDblUnion.dbl - auxDoubleArrayW[100];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_RATIONAL_DOUBLE %f differs from set value %f\n", auxDblUnion.dbl, auxDoubleArrayW[100]);
GOTOFAILURE
}
auxDblUnion.dbl = 0;
retCode = TIFFGetField(tif, TIFFTAG_SRATIONAL_DOUBLE, &auxDblUnion.dbl);
if (!retCode) { fprintf(stderr, "Can't read %s\n", "TIFFTAG_SRATIONAL_DOUBLE"); GOTOFAILURE }
auxDouble = -1.0 * auxDoubleArrayW[101];
dblDiffLimit = RATIONAL_EPS * auxDouble;
dblDiff = auxDblUnion.dbl - auxDouble;
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value of TIFFTAG_SRATIONAL_DOUBLE %f differs from set value %f\n", auxDblUnion.dbl, auxDouble);
GOTOFAILURE
}
/*- Fixed Array: TIFFTAG_RATIONAL_C0_DOUBLE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE */
count16 = 3; /* set fixed array length for checking */
retCode = TIFFGetField(tif, TIFFTAG_RATIONAL_C0_DOUBLE, &pVoidArray);
/*- pVoidArray points to a Tiff-internal temporary memorypart. Thus, contents needs to be saved. */
memcpy(&auxDoubleArray, pVoidArray, (count16 * sizeof(auxDoubleArray[0])));
for (i = 0; i < count16; i++) {
dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[110 + i];
dblDiff = auxDoubleArray[i] - auxDoubleArrayW[110 + i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value %d of TIFFTAG_RATIONAL_C0_DOUBLE Array %f differs from set value %f\n", i, auxDoubleArray[i], auxDoubleArrayW[110 + i]);
GOTOFAILURE
}
}
/*- Variable Array: TIFFTAG_SRATIONAL_C16_DOUBLE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_DOUBLE */
retCode = TIFFGetField(tif, TIFFTAG_SRATIONAL_C16_DOUBLE, &count16, &pVoidArray);
/*- pVoidArray points to a Tiff-internal temporary memorypart. Thus, contents needs to be saved. */
memcpy(&auxDoubleArray, pVoidArray, (count16 * sizeof(auxDoubleArray[0])));
for (i = 0; i < count16; i++) {
dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[120 + i];
dblDiff = auxDoubleArray[i] - auxDoubleArrayW[120 + i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
fprintf(stderr, "Read value %d of TIFFTAG_SRATIONAL_C16_DOUBLE Array %f differs from set value %f\n", i, auxDoubleArray[i], auxDoubleArrayW[120 + i]);
GOTOFAILURE
}
}
}
} else { /* blnAllCustomTags */
/*==== Automatically check all custom rational tags == READING ===*/
/*-- Get array, where standard TIFF tag fields are defined --*/
tFieldArray = _TIFFGetFields();
nTags = tFieldArray->count;
for (i = 0; i < nTags; i++) {
tTag = tFieldArray->fields[i].field_tag;
tType = tFieldArray->fields[i].field_type; /* e.g. TIFF_RATIONAL */
tWriteCount = tFieldArray->fields[i].field_writecount;
tSetFieldType = tFieldArray->fields[i].set_field_type; /* e.g. TIFF_SETGET_C0_FLOAT */
tFieldBit = tFieldArray->fields[i].field_bit;
tFieldName = tFieldArray->fields[i].field_name;
pVoid = NULL;
auxDblUnion.dbl = 0;
if (tType == TIFF_RATIONAL && tFieldBit == FIELD_CUSTOM) {
/*-- dependent on set_field_type read value --*/
switch (tSetFieldType) {
case TIFF_SETGET_FLOAT:
if (!TIFFGetField(tif, tTag, &auxFloat)) {
fprintf(stderr, "Can't read %s\n", tFieldArray->fields[i].field_name);
GOTOFAILURE
break;
}
/* compare read values with written ones */
if (tType == TIFF_RATIONAL || tType == TIFF_SRATIONAL) dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[i]; else dblDiffLimit = 1e-6;
dblDiff = auxFloat - auxDoubleArrayW[i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
/*--: EXIFTAG_SUBJECTDISTANCE: LibTiff returns value of "-1.0" if numerator equals 4294967295 (0xFFFFFFFF) to indicate infinite distance!
* However, there are two other EXIF tags where numerator indicates a special value and six other cases where the denominator indicates special values,
* which are not treated within LibTiff!!
*/
if (!(tTag == EXIFTAG_SUBJECTDISTANCE && auxFloat == -1.0)) {
fprintf(stderr, "%d:Read value of %s %f differs from set value %f\n", i, tFieldName, auxFloat, auxDoubleArrayW[i]);
GOTOFAILURE
}
}
break;
case TIFF_SETGET_DOUBLE:
/*-- Unfortunately, TIFF_SETGET_DOUBLE is used for TIFF_RATIONAL but those have to be read with FLOAT !!! */
/* Only after update with Rational2Double feature, also TIFF_RATIONAL can be read in double precision!!! */
/* Therefore, use a union to avoid overflow in TIFFGetField() return value
* and depending on version check for the right interface here:
* - old interface: correct value should be here a float
* - new interface: correct value should be here a double
* Interface version (old/new) is determined above.
*/
if (!TIFFGetField(tif, tTag, &auxDblUnion.dbl)) {
fprintf(stderr, "Can't read %s\n", tFieldArray->fields[i].field_name);
GOTOFAILURE
break;
}
if (tType == TIFF_RATIONAL || tType == TIFF_SRATIONAL) {
if (blnIsRational2Double) {
/* New interface allows also double precision for TIFF_RATIONAL */
auxDouble = auxDblUnion.dbl;
}
else {
/* Old interface reads TIFF_RATIONAL defined as TIFF_SETGET_DOUBLE alwasy as FLOAT */
auxDouble = (double)auxDblUnion.flt1;
}
} else {
auxDouble = auxDblUnion.dbl;
}
/* compare read values with written ones */
if (tType == TIFF_RATIONAL || tType == TIFF_SRATIONAL) dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[i]; else dblDiffLimit = 1e-6;
dblDiff = auxDouble - auxDoubleArrayW[i];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
/*--: EXIFTAG_SUBJECTDISTANCE: LibTiff returns value of "-1.0" if numerator equals 4294967295 (0xFFFFFFFF) to indicate infinite distance! */
if (!(tTag == EXIFTAG_SUBJECTDISTANCE && auxDouble == -1.0))
fprintf(stderr, "%d:Read value of %s %f differs from set value %f\n", i, tFieldName, auxDouble, auxDoubleArrayW[i]);
GOTOFAILURE
}
break;
case TIFF_SETGET_C0_FLOAT:
case TIFF_SETGET_C0_DOUBLE:
case TIFF_SETGET_C16_FLOAT:
case TIFF_SETGET_C16_DOUBLE:
case TIFF_SETGET_C32_FLOAT:
case TIFF_SETGET_C32_DOUBLE:
/* _Cxx_ just defines the size of the count parameter for the array as C0=char, C16=short or C32=long */
/*-- Check, if it is a single parameter, a fixed array or a variable array */
if (tWriteCount == 1) {
fprintf(stderr, "Reading: WriteCount for .set_field_type %d should be -1 or greather than 1! %s\n", tSetFieldType, tFieldArray->fields[i].field_name);
GOTOFAILURE
} else {
/*-- Either fix or variable array --*/
/* For arrays, distinguishing between float or double is essential. */
/* Now decide between fixed or variable array */
if (tWriteCount > 1) {
/* fixed array with needed arraysize defined in .field_writecount */
if (!TIFFGetField(tif, tTag, &pVoidArray)) {
fprintf(stderr, "Can't read %s\n", tFieldArray->fields[i].field_name);
GOTOFAILURE
break;
}
/* set tWriteCount to number of read samples for next steps */
auxLong = tWriteCount;
} else {
/* Special treatment of variable array. */
/* Dependent on Cxx, the count parameter is char, short or long. Therefore use unionLong! */
if (!TIFFGetField(tif, tTag, &auxLongUnion, &pVoidArray)) {
fprintf(stderr, "Can't read %s\n", tFieldArray->fields[i].field_name);
GOTOFAILURE
break;
}
/* set tWriteCount to number of read samples for next steps */
auxLong = auxLongUnion.Short1;
}
/* Save values from temporary array */
if (tSetFieldType == TIFF_SETGET_C0_FLOAT || tSetFieldType == TIFF_SETGET_C16_FLOAT || tSetFieldType == TIFF_SETGET_C32_FLOAT) {
memcpy(&auxFloatArray, pVoidArray, (auxLong * sizeof(auxFloatArray[0])));
/* compare read values with written ones */
if (tType == TIFF_RATIONAL || tType == TIFF_SRATIONAL) dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[i]; else dblDiffLimit = 1e-6;
for (j = 0; j < auxLong; j++) {
dblDiff = auxFloatArray[j] - auxFloatArrayW[i + j];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
/*if (auxFloatArray[j] != (float)auxFloatArrayW[i+j]) { */
fprintf(stderr, "Read value %d of %s #%d %f differs from set value %f\n", i, tFieldName, j, auxFloatArray[j], auxFloatArrayW[i + j]);
GOTOFAILURE
}
}
} else {
memcpy(&auxDoubleArray, pVoidArray, (auxLong * sizeof(auxDoubleArray[0])));
/* compare read values with written ones */
if (tType == TIFF_RATIONAL || tType == TIFF_SRATIONAL) dblDiffLimit = RATIONAL_EPS * auxDoubleArrayW[i]; else dblDiffLimit = 1e-6;
for (j = 0; j < auxLong; j++) {
dblDiff = auxDoubleArray[j] - auxDoubleArrayW[i + j];
if (fabs(dblDiff) > fabs(dblDiffLimit)) {
/*if (auxDoubleArray[j] != auxDoubleArrayW[i+j]) { */
fprintf(stderr, "Read value %d of %s #%d %f differs from set value %f\n", i, tFieldName, j, auxDoubleArray[j], auxDoubleArrayW[i + j]);
GOTOFAILURE
}
}
}
}
break;
default:
fprintf(stderr, "SetFieldType %d not defined within reading switch for %s.\n", tSetFieldType, tFieldName);
}; /*-- switch() --*/
} /* if () */
} /*-- for() --*/
} /* blnAllCustomTags */ /*==== END END - Automatically check all custom rational tags == READING END ===*/
TIFFClose(tif);
/* All tests passed; delete file and exit with success status. */
#ifdef FOR_AUTO_TESTING
unlink(filenameRead);
#endif
fprintf(stderr, "-------- Test finished OK ----------\n");
return 0;
failure:
/*
* Something goes wrong; close file and return unsuccessful status.
* Do not remove the file for further manual investigation.
*/
TIFFClose(tif);
fprintf(stderr, "-------- Test finished with FAILURE --------\n");
return 1;
}