Skip to content

Commit aa07607

Browse files
authored
Merge pull request #1425 from Exiv2/promote_default_tag_type
Promote remaining SHORT/LONG tags default type
2 parents 866d213 + 85e3a31 commit aa07607

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/tags_int.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,10 @@ namespace Exiv2 {
661661
ifd0Id, imgStruct, unsignedShort, 2, printValue), // TIFF tag
662662
TagInfo(0x0142, "TileWidth", N_("Tile Width"),
663663
N_("The tile width in pixels. This is the number of columns in each tile."),
664-
ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag
664+
ifd0Id, recOffset, unsignedLong, 1, printValue), // TIFF tag
665665
TagInfo(0x0143, "TileLength", N_("Tile Length"),
666666
N_("The tile length (height) in pixels. This is the number of rows in each tile."),
667-
ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag
667+
ifd0Id, recOffset, unsignedLong, 1, printValue), // TIFF tag
668668
TagInfo(0x0144, "TileOffsets", N_("Tile Offsets"),
669669
N_("For each tile, the byte offset of that tile, as compressed and "
670670
"stored on disk. The offset is specified with respect to the "
@@ -674,7 +674,7 @@ namespace Exiv2 {
674674
TagInfo(0x0145, "TileByteCounts", N_("Tile Byte Counts"),
675675
N_("For each tile, the number of (compressed) bytes in that tile. See "
676676
"TileOffsets for a description of how the byte counts are ordered."),
677-
ifd0Id, recOffset, unsignedShort, -1, printValue), // TIFF tag
677+
ifd0Id, recOffset, unsignedLong, -1, printValue), // TIFF tag
678678
TagInfo(0x014a, "SubIFDs", N_("SubIFD Offsets"),
679679
N_("Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."),
680680
ifd0Id, tiffEp, unsignedLong, -1, printValue),
@@ -1020,7 +1020,7 @@ namespace Exiv2 {
10201020
"sample values. Saturation is caused either by the sensor itself "
10211021
"becoming highly non-linear in response, or by the camera's analog "
10221022
"to digital converter clipping."),
1023-
ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
1023+
ifd0Id, dngTags, unsignedLong, -1, printValue), // DNG tag
10241024
TagInfo(0xc61e, "DefaultScale", N_("Default Scale"),
10251025
N_("DefaultScale is required for cameras with non-square pixels. It "
10261026
"specifies the default scale factors for each direction to convert "
@@ -1036,14 +1036,14 @@ namespace Exiv2 {
10361036
"of the final image area, in raw image coordinates (i.e., before the "
10371037
"DefaultScale has been applied), relative to the top-left corner of "
10381038
"the ActiveArea rectangle."),
1039-
ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag
1039+
ifd0Id, dngTags, unsignedLong, 2, printValue), // DNG tag
10401040
TagInfo(0xc620, "DefaultCropSize", N_("Default Crop Size"),
10411041
N_("Raw images often store extra pixels around the edges of the final "
10421042
"image. These extra pixels help prevent interpolation artifacts near "
10431043
"the edges of the final image. DefaultCropSize specifies the size of "
10441044
"the final image area, in raw image coordinates (i.e., before the "
10451045
"DefaultScale has been applied)."),
1046-
ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag
1046+
ifd0Id, dngTags, unsignedLong, 2, printValue), // DNG tag
10471047
TagInfo(0xc621, "ColorMatrix1", N_("Color Matrix 1"),
10481048
N_("ColorMatrix1 defines a transformation matrix that converts XYZ "
10491049
"values to reference camera native color space values, under the "
@@ -1247,15 +1247,15 @@ namespace Exiv2 {
12471247
TagInfo(0xc68d, "ActiveArea", N_("Active Area"),
12481248
N_("This rectangle defines the active (non-masked) pixels of the sensor. "
12491249
"The order of the rectangle coordinates is: top, left, bottom, right."),
1250-
ifd0Id, dngTags, unsignedShort, 4, printValue), // DNG tag
1250+
ifd0Id, dngTags, unsignedLong, 4, printValue), // DNG tag
12511251
TagInfo(0xc68e, "MaskedAreas", N_("Masked Areas"),
12521252
N_("This tag contains a list of non-overlapping rectangle coordinates of "
12531253
"fully masked pixels, which can be optionally used by DNG readers "
12541254
"to measure the black encoding level. The order of each rectangle's "
12551255
"coordinates is: top, left, bottom, right. If the raw image data has "
12561256
"already had its black encoding level subtracted, then this tag should "
12571257
"not be used, since the masked pixels are no longer useful."),
1258-
ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
1258+
ifd0Id, dngTags, unsignedLong, -1, printValue), // DNG tag
12591259
TagInfo(0xc68f, "AsShotICCProfile", N_("As-Shot ICC Profile"),
12601260
N_("This tag contains an ICC profile that, in conjunction with the "
12611261
"AsShotPreProfileMatrix tag, provides the camera manufacturer with a "
@@ -1527,20 +1527,20 @@ namespace Exiv2 {
15271527
"default final size of the larger original file from which this proxy was generated. "
15281528
"The default value for this tag is default final size of the current DNG file, which "
15291529
"is DefaultCropSize * DefaultScale."),
1530-
ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG 1.4 tag
1530+
ifd0Id, dngTags, unsignedLong, 2, printValue), // DNG 1.4 tag
15311531
TagInfo(0xc792, "OriginalBestQualityFinalSize", N_("Original Best Quality Final Size"),
15321532
N_("If this file is a proxy for a larger original DNG file, this tag specifics the "
15331533
"best quality final size of the larger original file from which this proxy was "
15341534
"generated. The default value for this tag is the OriginalDefaultFinalSize, if "
15351535
"specified. Otherwise the default value for this tag is the best quality size of "
15361536
"the current DNG file, which is DefaultCropSize * DefaultScale * BestQualityScale."),
1537-
ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG 1.4 tag
1537+
ifd0Id, dngTags, unsignedLong, 2, printValue), // DNG 1.4 tag
15381538
TagInfo(0xc793, "OriginalDefaultCropSize", N_("Original Default Crop Size"),
15391539
N_("If this file is a proxy for a larger original DNG file, this tag specifics the "
15401540
"DefaultCropSize of the larger original file from which this proxy was generated. "
15411541
"The default value for this tag is OriginalDefaultFinalSize, if specified. Otherwise, "
15421542
"the default value for this tag is the DefaultCropSize of the current DNG file."),
1543-
ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG 1.4 tag
1543+
ifd0Id, dngTags, unsignedLong, 2, printValue), // DNG 1.4 tag
15441544
TagInfo(0xc7a3, "ProfileHueSatMapEncoding", N_("Profile Hue Sat Map Encoding"),
15451545
N_("Provides a way for color profiles to specify how indexing into a 3D HueSatMap is "
15461546
"performed during raw conversion. This tag is not applicable to 2.5D HueSatMap tables "

0 commit comments

Comments
 (0)