diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-02-26 21:25:42 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-02-26 21:25:42 +0000 |
| commit | a1b7eac5e89451fa00d64f70382079888a39dee6 (patch) | |
| tree | 5867ac1854c77ee6fb2ae8d924373a73a30a9701 | |
| parent | e3f0b1d894a6224d07866a339f213ef2ff85dc02 (diff) | |
| parent | 1fc1faa5a91df37b9f70b71a448777f61af20b96 (diff) | |
| download | libtiff-git-a1b7eac5e89451fa00d64f70382079888a39dee6.tar.gz | |
Merge branch 'master' into 'master'
fix issue #78 warnings regarding RichTIFFIPTC data type
Closes #78
See merge request libtiff/libtiff!99
| -rw-r--r-- | libtiff/tif_dirinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c index e1f6b23e..b508040c 100644 --- a/libtiff/tif_dirinfo.c +++ b/libtiff/tif_dirinfo.c @@ -138,7 +138,7 @@ tiffFields[] = { { TIFFTAG_CFAPATTERN, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CFAPattern" , NULL}, { TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Copyright", NULL }, /* end Pixar tags */ - { TIFFTAG_RICHTIFFIPTC, -3, -3, TIFF_LONG, 0, TIFF_SETGET_C32_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "RichTIFFIPTC", NULL }, + { TIFFTAG_RICHTIFFIPTC, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "RichTIFFIPTC", NULL }, { TIFFTAG_PHOTOSHOP, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "Photoshop", NULL }, { TIFFTAG_EXIFIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "EXIFIFDOffset", (TIFFFieldArray*) &exifFieldArray }, { TIFFTAG_ICCPROFILE, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ICC Profile", NULL }, |