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

tif_dirinfo.c: fixed (MSVC) compiler reports about inconsistent use of const in tiffFields and exifFields definition

Browse Source
This commit is contained in:
Joris Van Damme 2007-09-24 06:40:14 +00:00
parent 86a7057d06
commit fca5e791dd
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-24 Joris Van Damme <joris.at.lebbeke@skynet.be>
* tif_dirinfo.c: Fixed (MSVC) compiler reports about
inconsistent use of const in tiffFields and exifFields definition
2007-09-20 Frank Warmerdam <warmerdam@pobox.com>
* tif_dirwrite.c: Always write tile/strip offsets and sizes

14
libtiff/tif_dirinfo.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirinfo.c,v 1.96 2007-09-22 15:08:27 dron Exp $ */
/* $Id: tif_dirinfo.c,v 1.97 2007-09-24 06:40:15 joris Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -42,10 +42,10 @@
* values accordingly.
*/
static const TIFFFieldArray tiffFieldArray;
static const TIFFFieldArray exifFieldArray;
static TIFFFieldArray tiffFieldArray;
static TIFFFieldArray exifFieldArray;
static const TIFFField
static TIFFField
tiffFields[] = {
{ TIFFTAG_SUBFILETYPE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_SUBFILETYPE, 1, 0, "SubfileType", NULL },
{ TIFFTAG_OSUBFILETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_SUBFILETYPE, 1, 0, "OldSubfileType", NULL },
@ -193,7 +193,7 @@ tiffFields[] = {
/* end DNG tags */
};
static const TIFFField
static 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 },
@ -253,9 +253,9 @@ exifFields[] = {
{ EXIFTAG_IMAGEUNIQUEID, 33, 33, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageUniqueID", NULL }
};
static const TIFFFieldArray
static TIFFFieldArray
tiffFieldArray = { tfiatImage, 0, TIFFArrayCount(tiffFields), tiffFields };
static const TIFFFieldArray
static TIFFFieldArray
exifFieldArray = { tfiatExif, 0, TIFFArrayCount(exifFields), exifFields };
const TIFFFieldArray*