summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libtiff/tif_dir.c118
-rw-r--r--libtiff/tif_dir.h38
-rw-r--r--libtiff/tif_dirinfo.c26
-rw-r--r--libtiff/tif_print.c26
4 files changed, 43 insertions, 165 deletions
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index e9a9ee32..dd8bcd36 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.c,v 1.49 2005-05-25 11:38:32 dron Exp $ */
+/* $Id: tif_dir.c,v 1.50 2005-06-01 10:17:21 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -141,12 +141,11 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_BITSPERSAMPLE:
td->td_bitspersample = (uint16) va_arg(ap, int);
/*
- * If the data require post-decoding processing
- * to byte-swap samples, set it up here. Note
- * that since tags are required to be ordered,
- * compression code can override this behaviour
- * in the setup method if it wants to roll the
- * post decoding work in with its normal work.
+ * If the data require post-decoding processing to byte-swap
+ * samples, set it up here. Note that since tags are required
+ * to be ordered, compression code can override this behaviour
+ * in the setup method if it wants to roll the post decoding
+ * work in with its normal work.
*/
if (tif->tif_flags & TIFF_SWAB) {
if (td->td_bitspersample == 16)
@@ -162,9 +161,9 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_COMPRESSION:
v = va_arg(ap, uint32) & 0xffff;
/*
- * If we're changing the compression scheme,
- * the notify the previous module so that it
- * can cleanup any state it's setup.
+ * If we're changing the compression scheme, the notify the
+ * previous module so that it can cleanup any state it's
+ * setup.
*/
if (TIFFFieldSet(tif, FIELD_COMPRESSION)) {
if (td->td_compression == v)
@@ -192,29 +191,6 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
goto badvalue;
td->td_fillorder = (uint16) v;
break;
- case TIFFTAG_DOCUMENTNAME:
- _TIFFsetString(&td->td_documentname, va_arg(ap, char*));
- break;
- case TIFFTAG_ARTIST:
- _TIFFsetString(&td->td_artist, va_arg(ap, char*));
- break;
- case TIFFTAG_DATETIME:
- _TIFFsetString(&td->td_datetime, va_arg(ap, char*));
- break;
- case TIFFTAG_HOSTCOMPUTER:
- _TIFFsetString(&td->td_hostcomputer, va_arg(ap, char*));
- break;
- case TIFFTAG_IMAGEDESCRIPTION:
- _TIFFsetString(&td->td_imagedescription, va_arg(ap, char*));
- break;
- case TIFFTAG_MAKE:
- _TIFFsetString(&td->td_make, va_arg(ap, char*));
- break;
- case TIFFTAG_MODEL:
- _TIFFsetString(&td->td_model, va_arg(ap, char*));
- break;
- case TIFFTAG_COPYRIGHT:
- _TIFFsetString(&td->td_copyright, va_arg(ap, char*));
break;
case TIFFTAG_ORIENTATION:
v = va_arg(ap, uint32);
@@ -266,9 +242,6 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
goto badvalue;
td->td_planarconfig = (uint16) v;
break;
- case TIFFTAG_PAGENAME:
- _TIFFsetString(&td->td_pagename, va_arg(ap, char*));
- break;
case TIFFTAG_XPOSITION:
td->td_xposition = (float) va_arg(ap, dblparam_t);
break;
@@ -382,12 +355,6 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_PIXAR_IMAGEFULLLENGTH:
td->td_imagefulllength = va_arg(ap, uint32);
break;
- case TIFFTAG_PIXAR_TEXTUREFORMAT:
- _TIFFsetString(&td->td_textureformat, va_arg(ap, char*));
- break;
- case TIFFTAG_PIXAR_WRAPMODES:
- _TIFFsetString(&td->td_wrapmodes, va_arg(ap, char*));
- break;
case TIFFTAG_PIXAR_FOVCOT:
td->td_fovcot = (float) va_arg(ap, dblparam_t);
break;
@@ -459,9 +426,6 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_NUMBEROFINKS:
td->td_ninks = (uint16) va_arg(ap, int);
break;
- case TIFFTAG_TARGETPRINTER:
- _TIFFsetString(&td->td_targetprinter, va_arg(ap, char*));
- break;
case TIFFTAG_ICCPROFILE:
td->td_profileLength = (uint32) va_arg(ap, uint32);
_TIFFsetByteArray(&td->td_profileData, va_arg(ap, void*),
@@ -489,15 +453,13 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
int tv_size, iCustom;
/*
- * This can happen if multiple images are open with
- * different codecs which have private tags. The
- * global tag information table may then have tags
- * that are valid for one file but not the other.
- * If the client tries to set a tag that is not valid
- * for the image's codec then we'll arrive here. This
- * happens, for example, when tiffcp is used to convert
- * between compression schemes and codec-specific tags
- * are blindly copied.
+ * This can happen if multiple images are open with different
+ * codecs which have private tags. The global tag information
+ * table may then have tags that are valid for one file but not
+ * the other. If the client tries to set a tag that is not valid
+ * for the image's codec then we'll arrive here. This
+ * happens, for example, when tiffcp is used to convert between
+ * compression schemes and codec-specific tags are blindly copied.
*/
if(fip == NULL || fip->field_bit != FIELD_CUSTOM) {
TIFFError(module,
@@ -760,30 +722,6 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_FILLORDER:
*va_arg(ap, uint16*) = td->td_fillorder;
break;
- case TIFFTAG_DOCUMENTNAME:
- *va_arg(ap, char**) = td->td_documentname;
- break;
- case TIFFTAG_ARTIST:
- *va_arg(ap, char**) = td->td_artist;
- break;
- case TIFFTAG_DATETIME:
- *va_arg(ap, char**) = td->td_datetime;
- break;
- case TIFFTAG_HOSTCOMPUTER:
- *va_arg(ap, char**) = td->td_hostcomputer;
- break;
- case TIFFTAG_IMAGEDESCRIPTION:
- *va_arg(ap, char**) = td->td_imagedescription;
- break;
- case TIFFTAG_MAKE:
- *va_arg(ap, char**) = td->td_make;
- break;
- case TIFFTAG_MODEL:
- *va_arg(ap, char**) = td->td_model;
- break;
- case TIFFTAG_COPYRIGHT:
- *va_arg(ap, char**) = td->td_copyright;
- break;
case TIFFTAG_ORIENTATION:
*va_arg(ap, uint16*) = td->td_orientation;
break;
@@ -820,9 +758,6 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_YPOSITION:
*va_arg(ap, float*) = td->td_yposition;
break;
- case TIFFTAG_PAGENAME:
- *va_arg(ap, char**) = td->td_pagename;
- break;
case TIFFTAG_RESOLUTIONUNIT:
*va_arg(ap, uint16*) = td->td_resolutionunit;
break;
@@ -933,9 +868,6 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_NUMBEROFINKS:
*va_arg(ap, uint16*) = td->td_ninks;
break;
- case TIFFTAG_TARGETPRINTER:
- *va_arg(ap, char**) = td->td_targetprinter;
- break;
case TIFFTAG_ICCPROFILE:
*va_arg(ap, uint32*) = td->td_profileLength;
*va_arg(ap, void**) = td->td_profileData;
@@ -959,12 +891,6 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_PIXAR_IMAGEFULLLENGTH:
*va_arg(ap, uint32*) = td->td_imagefulllength;
break;
- case TIFFTAG_PIXAR_TEXTUREFORMAT:
- *va_arg(ap, char**) = td->td_textureformat;
- break;
- case TIFFTAG_PIXAR_WRAPMODES:
- *va_arg(ap, char**) = td->td_wrapmodes;
- break;
case TIFFTAG_PIXAR_FOVCOT:
*va_arg(ap, float*) = td->td_fovcot;
break;
@@ -1132,20 +1058,10 @@ TIFFFreeDirectory(TIFF* tif)
CleanupField(td_colormap[0]);
CleanupField(td_colormap[1]);
CleanupField(td_colormap[2]);
- CleanupField(td_documentname);
- CleanupField(td_artist);
- CleanupField(td_datetime);
- CleanupField(td_hostcomputer);
- CleanupField(td_imagedescription);
- CleanupField(td_make);
- CleanupField(td_model);
- CleanupField(td_copyright);
- CleanupField(td_pagename);
CleanupField(td_sampleinfo);
CleanupField(td_subifd);
CleanupField(td_ycbcrcoeffs);
CleanupField(td_inknames);
- CleanupField(td_targetprinter);
CleanupField(td_whitepoint);
CleanupField(td_primarychromas);
CleanupField(td_refblackwhite);
@@ -1159,8 +1075,6 @@ TIFFFreeDirectory(TIFF* tif)
CleanupField(td_stripoffset);
CleanupField(td_stripbytecount);
/* Begin Pixar Tags */
- CleanupField(td_textureformat);
- CleanupField(td_wrapmodes);
CleanupField(td_matrixWorldToScreen);
CleanupField(td_matrixWorldToCamera);
/* End Pixar Tags */
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
index 3e65de33..7d6b7ec9 100644
--- a/libtiff/tif_dir.h
+++ b/libtiff/tif_dir.h
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.h,v 1.15 2004-09-26 09:49:53 dron Exp $ */
+/* $Id: tif_dir.h,v 1.16 2005-06-01 10:17:21 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -62,15 +62,6 @@ typedef struct {
uint16 td_extrasamples;
uint16* td_sampleinfo;
double td_stonits;
- char* td_documentname;
- char* td_artist;
- char* td_datetime;
- char* td_hostcomputer;
- char* td_imagedescription;
- char* td_make;
- char* td_model;
- char* td_copyright;
- char* td_pagename;
tstrip_t td_stripsperimage;
tstrip_t td_nstrips; /* size of offset & bytecount arrays */
uint32* td_stripoffset;
@@ -93,7 +84,6 @@ typedef struct {
uint16 td_dotrange[2];
int td_inknameslen;
char* td_inknames;
- char* td_targetprinter;
/* ICC parameters */
uint32 td_profileLength;
void *td_profileData;
@@ -105,8 +95,6 @@ typedef struct {
void *td_richtiffiptcData;
/* Begin Pixar Tag values. */
uint32 td_imagefullwidth, td_imagefulllength;
- char* td_textureformat;
- char* td_wrapmodes;
float td_fovcot;
float* td_matrixWorldToScreen;
float* td_matrixWorldToCamera;
@@ -146,25 +134,25 @@ typedef struct {
#define FIELD_PHOTOMETRIC 8
#define FIELD_THRESHHOLDING 9
#define FIELD_FILLORDER 10
-#define FIELD_DOCUMENTNAME 11
-#define FIELD_IMAGEDESCRIPTION 12
-#define FIELD_MAKE 13
-#define FIELD_MODEL 14
+/* unused - was FIELD_DOCUMENTNAME 11 */
+/* unused - was FIELD_IMAGEDESCRIPTION 12 */
+/* unused - was FIELD_MAKE 13 */
+/* unused - was FIELD_MODEL 14 */
#define FIELD_ORIENTATION 15
#define FIELD_SAMPLESPERPIXEL 16
#define FIELD_ROWSPERSTRIP 17
#define FIELD_MINSAMPLEVALUE 18
#define FIELD_MAXSAMPLEVALUE 19
#define FIELD_PLANARCONFIG 20
-#define FIELD_PAGENAME 21
+/* unused - was FIELD_PAGENAME 21 */
#define FIELD_RESOLUTIONUNIT 22
#define FIELD_PAGENUMBER 23
#define FIELD_STRIPBYTECOUNTS 24
#define FIELD_STRIPOFFSETS 25
#define FIELD_COLORMAP 26
-#define FIELD_ARTIST 27
-#define FIELD_DATETIME 28
-#define FIELD_HOSTCOMPUTER 29
+/* unused - was FIELD_ARTIST 27 */
+/* unused - was FIELD_DATETIME 28 */
+/* unused - was FIELD_HOSTCOMPUTER 29 */
/* unused - was FIELD_SOFTWARE 30 */
#define FIELD_EXTRASAMPLES 31
#define FIELD_SAMPLEFORMAT 32
@@ -183,7 +171,7 @@ typedef struct {
#define FIELD_INKSET 45
#define FIELD_INKNAMES 46
#define FIELD_DOTRANGE 47
-#define FIELD_TARGETPRINTER 48
+/* unused - was FIELD_TARGETPRINTER 48 */
#define FIELD_SUBIFD 49
#define FIELD_NUMBEROFINKS 50
#define FIELD_ICCPROFILE 51
@@ -193,12 +181,12 @@ typedef struct {
/* Begin PIXAR */
#define FIELD_IMAGEFULLWIDTH 55
#define FIELD_IMAGEFULLLENGTH 56
-#define FIELD_TEXTUREFORMAT 57
-#define FIELD_WRAPMODES 58
+/* unused - was FIELD_TEXTUREFORMAT 57 */
+/* unused - was FIELD_WRAPMODES 58 */
#define FIELD_FOVCOT 59
#define FIELD_MATRIX_WORLDTOSCREEN 60
#define FIELD_MATRIX_WORLDTOCAMERA 61
-#define FIELD_COPYRIGHT 62
+/* unused - was FIELD_COPYRIGHT 62 */
#define FIELD_XMLPACKET 63
/* FIELD_CUSTOM (see tiffio.h) 65 */
/* end of support for well-known tags; codec-private tags follow */
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
index d26b694c..6c8c9f16 100644
--- a/libtiff/tif_dirinfo.c
+++ b/libtiff/tif_dirinfo.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirinfo.c,v 1.43 2005-05-25 13:10:09 dron Exp $ */
+/* $Id: tif_dirinfo.c,v 1.44 2005-06-01 10:17:21 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -87,13 +87,13 @@ const TIFFFieldInfo tiffFieldInfo[] = {
TRUE, FALSE, "CellLength" },
{ TIFFTAG_FILLORDER, 1, 1, TIFF_SHORT, FIELD_FILLORDER,
FALSE, FALSE, "FillOrder" },
- { TIFFTAG_DOCUMENTNAME, -1,-1, TIFF_ASCII, FIELD_DOCUMENTNAME,
+ { TIFFTAG_DOCUMENTNAME, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "DocumentName" },
- { TIFFTAG_IMAGEDESCRIPTION, -1,-1, TIFF_ASCII, FIELD_IMAGEDESCRIPTION,
+ { TIFFTAG_IMAGEDESCRIPTION, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "ImageDescription" },
- { TIFFTAG_MAKE, -1,-1, TIFF_ASCII, FIELD_MAKE,
+ { TIFFTAG_MAKE, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "Make" },
- { TIFFTAG_MODEL, -1,-1, TIFF_ASCII, FIELD_MODEL,
+ { TIFFTAG_MODEL, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "Model" },
{ TIFFTAG_STRIPOFFSETS, -1,-1, TIFF_LONG, FIELD_STRIPOFFSETS,
FALSE, FALSE, "StripOffsets" },
@@ -121,7 +121,7 @@ const TIFFFieldInfo tiffFieldInfo[] = {
FALSE, FALSE, "YResolution" },
{ TIFFTAG_PLANARCONFIG, 1, 1, TIFF_SHORT, FIELD_PLANARCONFIG,
FALSE, FALSE, "PlanarConfiguration" },
- { TIFFTAG_PAGENAME, -1,-1, TIFF_ASCII, FIELD_PAGENAME,
+ { TIFFTAG_PAGENAME, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "PageName" },
{ TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, FIELD_POSITION,
TRUE, FALSE, "XPosition" },
@@ -145,11 +145,11 @@ const TIFFFieldInfo tiffFieldInfo[] = {
TRUE, FALSE, "TransferFunction" },
{ TIFFTAG_SOFTWARE, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "Software" },
- { TIFFTAG_DATETIME, 20,20, TIFF_ASCII, FIELD_DATETIME,
+ { TIFFTAG_DATETIME, 20,20, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "DateTime" },
- { TIFFTAG_ARTIST, -1,-1, TIFF_ASCII, FIELD_ARTIST,
+ { TIFFTAG_ARTIST, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "Artist" },
- { TIFFTAG_HOSTCOMPUTER, -1,-1, TIFF_ASCII, FIELD_HOSTCOMPUTER,
+ { TIFFTAG_HOSTCOMPUTER, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "HostComputer" },
{ TIFFTAG_WHITEPOINT, 2, 2, TIFF_RATIONAL,FIELD_WHITEPOINT,
TRUE, FALSE, "WhitePoint" },
@@ -187,7 +187,7 @@ const TIFFFieldInfo tiffFieldInfo[] = {
FALSE, FALSE, "DotRange" },
{ TIFFTAG_DOTRANGE, 2, 2, TIFF_BYTE, FIELD_DOTRANGE,
FALSE, FALSE, "DotRange" },
- { TIFFTAG_TARGETPRINTER, -1,-1, TIFF_ASCII, FIELD_TARGETPRINTER,
+ { TIFFTAG_TARGETPRINTER, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "TargetPrinter" },
{ TIFFTAG_EXTRASAMPLES, -1,-1, TIFF_SHORT, FIELD_EXTRASAMPLES,
FALSE, TRUE, "ExtraSamples" },
@@ -232,9 +232,9 @@ const TIFFFieldInfo tiffFieldInfo[] = {
TRUE, FALSE, "ImageFullWidth" },
{ TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG, FIELD_IMAGEFULLLENGTH,
TRUE, FALSE, "ImageFullLength" },
- { TIFFTAG_PIXAR_TEXTUREFORMAT, -1, -1, TIFF_ASCII, FIELD_TEXTUREFORMAT,
+ { TIFFTAG_PIXAR_TEXTUREFORMAT, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "TextureFormat" },
- { TIFFTAG_PIXAR_WRAPMODES, -1, -1, TIFF_ASCII, FIELD_WRAPMODES,
+ { TIFFTAG_PIXAR_WRAPMODES, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "TextureWrapModes" },
{ TIFFTAG_PIXAR_FOVCOT, 1, 1, TIFF_FLOAT, FIELD_FOVCOT,
TRUE, FALSE, "FieldOfViewCotan" },
@@ -242,7 +242,7 @@ const TIFFFieldInfo tiffFieldInfo[] = {
FIELD_MATRIX_WORLDTOSCREEN, TRUE, FALSE, "MatrixWorldToScreen" },
{ TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, 16,16, TIFF_FLOAT,
FIELD_MATRIX_WORLDTOCAMERA, TRUE, FALSE, "MatrixWorldToCamera" },
- { TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, FIELD_COPYRIGHT,
+ { TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
TRUE, FALSE, "Copyright" },
/* end Pixar tags */
{ TIFFTAG_RICHTIFFIPTC, -1, -3, TIFF_LONG, FIELD_RICHTIFFIPTC,
diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
index 424dcb84..aa7bc9e1 100644
--- a/libtiff/tif_print.c
+++ b/libtiff/tif_print.c
@@ -1,4 +1,4 @@
-/* $Id: tif_print.c,v 1.24 2005-05-25 13:10:09 dron Exp $ */
+/* $Id: tif_print.c,v 1.25 2005-06-01 10:17:21 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -107,10 +107,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
(unsigned long) td->td_imagefullwidth,
(unsigned long) td->td_imagefulllength);
}
- if (TIFFFieldSet(tif,FIELD_TEXTUREFORMAT))
- _TIFFprintAsciiTag(fd, "Texture Format", td->td_textureformat);
- if (TIFFFieldSet(tif,FIELD_WRAPMODES))
- _TIFFprintAsciiTag(fd, "Texture Wrap Modes", td->td_wrapmodes);
if (TIFFFieldSet(tif,FIELD_FOVCOT))
fprintf(fd, " Field of View Cotangent: %g\n", td->td_fovcot);
if (TIFFFieldSet(tif,FIELD_MATRIX_WORLDTOSCREEN)) {
@@ -282,8 +278,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
if (TIFFFieldSet(tif,FIELD_DOTRANGE))
fprintf(fd, " Dot Range: %u-%u\n",
td->td_dotrange[0], td->td_dotrange[1]);
- if (TIFFFieldSet(tif,FIELD_TARGETPRINTER))
- _TIFFprintAsciiTag(fd, "Target Printer", td->td_targetprinter);
if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) {
fprintf(fd, " Thresholding: ");
switch (td->td_threshholding) {
@@ -354,22 +348,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
if (TIFFFieldSet(tif,FIELD_HALFTONEHINTS))
fprintf(fd, " Halftone Hints: light %u dark %u\n",
td->td_halftonehints[0], td->td_halftonehints[1]);
- if (TIFFFieldSet(tif,FIELD_ARTIST))
- _TIFFprintAsciiTag(fd, "Artist", td->td_artist);
- if (TIFFFieldSet(tif,FIELD_DATETIME))
- _TIFFprintAsciiTag(fd, "Date & Time", td->td_datetime);
- if (TIFFFieldSet(tif,FIELD_HOSTCOMPUTER))
- _TIFFprintAsciiTag(fd, "Host Computer", td->td_hostcomputer);
- if (TIFFFieldSet(tif,FIELD_COPYRIGHT))
- _TIFFprintAsciiTag(fd, "Copyright", td->td_copyright);
- if (TIFFFieldSet(tif,FIELD_DOCUMENTNAME))
- _TIFFprintAsciiTag(fd, "Document Name", td->td_documentname);
- if (TIFFFieldSet(tif,FIELD_IMAGEDESCRIPTION))
- _TIFFprintAsciiTag(fd, "Image Description", td->td_imagedescription);
- if (TIFFFieldSet(tif,FIELD_MAKE))
- _TIFFprintAsciiTag(fd, "Make", td->td_make);
- if (TIFFFieldSet(tif,FIELD_MODEL))
- _TIFFprintAsciiTag(fd, "Model", td->td_model);
if (TIFFFieldSet(tif,FIELD_ORIENTATION)) {
fprintf(fd, " Orientation: ");
if (td->td_orientation < NORIENTNAMES)
@@ -412,8 +390,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
break;
}
}
- if (TIFFFieldSet(tif,FIELD_PAGENAME))
- _TIFFprintAsciiTag(fd, "Page Name", td->td_pagename);
if (TIFFFieldSet(tif,FIELD_PAGENUMBER))
fprintf(fd, " Page Number: %u-%u\n",
td->td_pagenumber[0], td->td_pagenumber[1]);
View Lorry Controller Status