Skip to content

Commit b1b9e74

Browse files
norbertwgkmilos
authored andcommitted
change print of Exif.Canon.SerialNumber
output now aligned with Canon Photo Digital Professional 4 as print0x000c was also used for 0x000a, new function print0x000a as copy from old print0x000c
1 parent b5e9e90 commit b1b9e74

15 files changed

+45
-27
lines changed

src/canonmn_int.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
490490
{0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), IfdId::canonId, SectionId::makerTags, asciiString, -1,
491491
printValue},
492492
{0x000a, "0x000a", N_("0x000a"), N_("Unknown"), IfdId::canonId, SectionId::makerTags, unsignedLong, -1,
493-
print0x000c},
493+
print0x000a},
494494
{0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), IfdId::canonId, SectionId::makerTags,
495495
unsignedLong, -1, print0x000c},
496496
{0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), IfdId::canonId, SectionId::makerTags, unsignedShort,
@@ -2811,14 +2811,30 @@ std::ostream& CanonMakerNote::print0x0008(std::ostream& os, const Value& value,
28112811
return os << n.substr(0, n.length() - 4) << "-" << n.substr(n.length() - 4);
28122812
}
28132813

2814-
std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData*) {
2814+
std::ostream& CanonMakerNote::print0x000a(std::ostream& os, const Value& value, const ExifData*) {
28152815
std::istringstream is(value.toString());
28162816
uint32_t l = 0;
28172817
is >> l;
28182818
return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
28192819
<< std::setfill('0') << std::dec << (l & 0x0000ffff);
28202820
}
28212821

2822+
std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData* exifData) {
2823+
std::istringstream is(value.toString());
2824+
2825+
ExifKey key("Exif.Canon.ModelID");
2826+
auto pos = exifData->findKey(key);
2827+
// if model is EOS D30
2828+
if (pos != exifData->end() && pos->value().count() == 1 && pos->value().toInt64() == 0x01140000) {
2829+
uint32_t l = 0;
2830+
is >> l;
2831+
return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
2832+
<< std::setfill('0') << std::dec << (l & 0x0000ffff);
2833+
} else {
2834+
return os << value;
2835+
}
2836+
}
2837+
28222838
std::ostream& CanonMakerNote::printCs0x0002(std::ostream& os, const Value& value, const ExifData*) {
28232839
if (value.typeId() != unsignedShort || value.count() == 0)
28242840
return os << value;

src/canonmn_int.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ class CanonMakerNote {
103103
static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
104104
//! Print the image number
105105
static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
106+
//! Print 0x000a
107+
static std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
106108
//! Print the serial number of the camera
107109
static std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
108110
//! Self timer

test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Exif.Canon.ImageType Ascii 32 Canon EOS 5D Mark II
9191
Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 2.0.8 Firmware Version 2.0.8
9292
Exif.Canon.FileNumber Long 1 0 (0)
9393
Exif.Canon.OwnerName Ascii 32
94-
Exif.Canon.SerialNumber Long 1 210104331 0c8561451
94+
Exif.Canon.SerialNumber Long 1 210104331 210104331
9595
Exif.Canon.ModelID Long 1 2147484184 EOS 5D Mark II
9696
Exif.Canon.SerialNumberFormat Long 1 2684354560 Format 2
9797
Exif.Canon.AFInfo Short 50 100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000 100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000

test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0
9191
Exif.Canon.ImageType Ascii 23 Canon EOS-1Ds Mark III Canon EOS-1Ds Mark III
9292
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.2.0 Firmware Version 1.2.0
9393
Exif.Canon.OwnerName Ascii 32
94-
Exif.Canon.SerialNumber Long 1 607779 000917955
94+
Exif.Canon.SerialNumber Long 1 607779 607779
9595
Exif.Canon.CameraInfo Undefined 1536 170 170 97 56 96 56 80 0 136 134 5 3 0 0 0 0 0 0 1 0 0 0 0 0 160 138 92 93 86 0 90 12 0 0 0 0 0 0 187 187 1 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 64 40 0 0 0 36 0 36 0 204 204 2 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 9 0 0 0 184 11 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 132 0 0 0 1 0 0 0 17 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 4 3 112 64 3 6 3 3 9 252 3 10 240 4 12 160 16 4 13 112 8 9 14 0 0 3 112 48 0 0 0 11 0 0 0 0 0 0 0 0 0 0 32 19 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 6 7 4 0 0 0 4 16 5 3 3 17 99 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 12 0 6 0 16 0 2 0 0 0 0 0 0 0 0 0 0 1 32 88 0 254 0 90 0 90 129 119 138 239 8 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 49 46 50 46 48 0 0 0 0 0 0 0 56 100 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 0 145 3 0 0 100 0 0 0 84 13 0 0 241 16 0 0 0 0 0 0 101 0 0 0 146 3 0 0 100 0 0 0 10 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 3 0 4 0 4 119 1 80 125 144 81 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 237 1 0 4 0 4 163 2 240 46 146 81 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 244 1 0 4 0 4 75 2 176 100 146 145 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 251 1 0 4 0 4 158 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 251 1 0 4 0 4 158 2 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 3 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 129 0 129 0 0 0 255 255 255 255 85 110 116 105 116 108 101 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 219 1 0 4 0 4 93 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 247 200 201 80 0 0 0 0 16 0 0 0 16 0 0 0 16 0 0 0 0 0 0 0 0 0 0 0 42 39 76 143 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 170 170 97 56 96 56 80 0 136 134 5 3 0 0 0 0 0 0 1 0 0 0 0 0 160 138 92 93 86 0 90 12 0 0 0 0 0 0 187 187 1 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 64 40 0 0 0 36 0 36 0 204 204 2 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 9 0 0 0 184 11 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 132 0 0 0 1 0 0 0 17 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 4 3 112 64 3 6 3 3 9 252 3 10 240 4 12 160 16 4 13 112 8 9 14 0 0 3 112 48 0 0 0 11 0 0 0 0 0 0 0 0 0 0 32 19 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 6 7 4 0 0 0 4 16 5 3 3 17 99 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 12 0 6 0 16 0 2 0 0 0 0 0 0 0 0 0 0 1 32 88 0 254 0 90 0 90 129 119 138 239 8 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 49 46 50 46 48 0 0 0 0 0 0 0 56 100 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 0 0 145 3 0 0 100 0 0 0 84 13 0 0 241 16 0 0 0 0 0 0 101 0 0 0 146 3 0 0 100 0 0 0 10 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 3 0 4 0 4 119 1 80 125 144 81 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 237 1 0 4 0 4 163 2 240 46 146 81 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 244 1 0 4 0 4 75 2 176 100 146 145 35 70 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 251 1 0 4 0 4 158 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 251 1 0 4 0 4 158 2 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 3 0 0 0 239 190 173 222 239 190 173 222 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 129 0 129 0 0 0 255 255 255 255 85 110 116 105 116 108 101 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 219 1 0 4 0 4 93 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 4 0 4 0 0 0 0 0 0 0 0 247 200 201 80 0 0 0 0 16 0 0 0 16 0 0 0 16 0 0 0 0 0 0 0 0 0 0 0 42 39 76 143 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9696
Exif.Canon.ModelID Long 1 2147484181 EOS-1Ds Mark III
9797
Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 0 159 7 112

test/data/test_reference_files/crw-test.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
1111
Exif.Canon.OwnerName Ascii 15 Andreas Huggel
1212
Exif.Image.Make Ascii 6 Canon
1313
Exif.Image.Model Ascii 20 Canon PowerShot S40
14-
Exif.Canon.SerialNumber Long 2 43b226716
14+
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
1515
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
1616
Exif.Canon.FocalLength Short 4 7.1 mm
1717
Exif.CanonSi.AutoISO Short 1 100
@@ -93,7 +93,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
9393
Exif.Canon.OwnerName Ascii 16 Different owner
9494
Exif.Image.Make Ascii 6 Canon
9595
Exif.Image.Model Ascii 20 Canon PowerShot S40
96-
Exif.Canon.SerialNumber Long 2 000000001
96+
Exif.Canon.SerialNumber Long 2 1 0
9797
Exif.Canon.FirmwareVersion Ascii 17 Whatever version
9898
Exif.Canon.FocalLength Short 4 2 227 286 215
9999
Exif.CanonSi.AutoISO Short 1 100
@@ -134,7 +134,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
134134
Exif.Canon.OwnerName Ascii 15 Andreas Huggel
135135
Exif.Image.Make Ascii 6 Canon
136136
Exif.Image.Model Ascii 20 Canon PowerShot S40
137-
Exif.Canon.SerialNumber Long 2 43b226716
137+
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
138138
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
139139
Exif.Canon.FocalLength Short 4 7.1 mm
140140
Exif.CanonSi.AutoISO Short 1 100
@@ -207,7 +207,7 @@ Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 18:54:36
207207
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
208208
Exif.Image.Make Ascii 6 Canon
209209
Exif.Image.Model Ascii 20 Canon PowerShot S40
210-
Exif.Canon.SerialNumber Long 2 43b226716
210+
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
211211
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
212212
Exif.Canon.FocalLength Short 4 7.1 mm
213213
Exif.CanonSi.AutoISO Short 1 100

test/data/test_reference_files/exiv2-bug1140.exv.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0
9090
Exif.Canon.ImageType Ascii 32 Canon EOS 30D Canon EOS 30D
9191
Exif.Canon.FirmwareVersion Ascii 32 Firmware 1.0.5 Firmware 1.0.5
9292
Exif.Canon.OwnerName Ascii 32 unknown unknown
93-
Exif.Canon.SerialNumber Long 1 1520906211 5aa712259
93+
Exif.Canon.SerialNumber Long 1 1520906211 1520906211
9494
Exif.Canon.CameraInfo Undefined 1024 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9595
Exif.CanonCf.NoiseReduction Short 1 256 256
9696
Exif.CanonCf.ShutterAeLock Short 1 513 513

test/data/test_reference_files/exiv2-bug1202.jpg.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Exif.CanonFi.RawJpgSize SShort 1 -1 n/a
9696
Exif.CanonFi.NoiseReduction SShort 1 -1 (-1)
9797
Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG IMG:EOS 300D DIGITAL JPEG
9898
Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 Firmware Version 1.0.2
99-
Exif.Canon.SerialNumber Long 1 570004681 21f938089
99+
Exif.Canon.SerialNumber Long 1 570004681 570004681
100100
Exif.Canon.SerialNumberFormat Long 1 2415919104 Format 1
101101
Exif.Canon.FileNumber Long 1 1030390 103-0390
102102
Exif.Canon.OwnerName Ascii 32

0 commit comments

Comments
 (0)