Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change print of Exif.Canon.SerialNumber (backport #2806) #2971

Merged
merged 2 commits into from
May 17, 2024
Merged

change print of Exif.Canon.SerialNumber (backport #2806) #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c824f2
change print of Exif.Canon.SerialNumber
norbertwg Oct 25, 2023
956efd9
check if exifdata is not null
norbertwg May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
{0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), IfdId::canonId, SectionId::makerTags, asciiString, -1,
printValue},
{0x000a, "0x000a", N_("0x000a"), N_("Unknown"), IfdId::canonId, SectionId::makerTags, unsignedLong, -1,
print0x000c},
print0x000a},
{0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), IfdId::canonId, SectionId::makerTags,
unsignedLong, -1, print0x000c},
{0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), IfdId::canonId, SectionId::makerTags, unsignedShort,
Expand Down Expand Up @@ -2630,14 +2630,34 @@ std::ostream& CanonMakerNote::print0x0008(std::ostream& os, const Value& value,
return os << n.substr(0, n.length() - 4) << "-" << n.substr(n.length() - 4);
}

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

std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData* exifData) {
std::istringstream is(value.toString());

if (!exifData) {
return os << value;
}

ExifKey key("Exif.Canon.ModelID");
auto pos = exifData->findKey(key);
// if model is EOS D30
if (pos != exifData->end() && pos->value().count() == 1 && pos->value().toInt64() == 0x01140000) {
uint32_t l = 0;
is >> l;
return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
<< std::setfill('0') << std::dec << (l & 0x0000ffff);
} else {
return os << value;
}
}

std::ostream& CanonMakerNote::printCs0x0002(std::ostream& os, const Value& value, const ExifData*) {
if (value.typeId() != unsignedShort || value.count() == 0)
return os << value;
Expand Down
2 changes: 2 additions & 0 deletions src/canonmn_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ class CanonMakerNote {
static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
//! Print the image number
static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
//! Print 0x000a
static std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
//! Print the serial number of the camera
static std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
//! Self timer
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Exif.Canon.ImageType Ascii 32 Canon EOS 5D Mark II
Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 2.0.8 Firmware Version 2.0.8
Exif.Canon.FileNumber Long 1 0 (0)
Exif.Canon.OwnerName Ascii 32
Exif.Canon.SerialNumber Long 1 210104331 0c8561451
Exif.Canon.SerialNumber Long 1 210104331 210104331
Exif.Canon.ModelID Long 1 2147484184 EOS 5D Mark II
Exif.Canon.SerialNumberFormat Long 1 2684354560 Format 2
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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 23 Canon EOS-1Ds Mark III Canon EOS-1Ds Mark III
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.2.0 Firmware Version 1.2.0
Exif.Canon.OwnerName Ascii 32
Exif.Canon.SerialNumber Long 1 607779 000917955
Exif.Canon.SerialNumber Long 1 607779 607779
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
Exif.Canon.ModelID Long 1 2147484181 EOS-1Ds Mark III
Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 0 159 7 112
Expand Down
8 changes: 4 additions & 4 deletions test/data/test_reference_files/crw-test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
Exif.Canon.OwnerName Ascii 15 Andreas Huggel
Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.AutoISO Short 1 100
Expand Down Expand Up @@ -93,7 +93,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
Exif.Canon.OwnerName Ascii 16 Different owner
Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 000000001
Exif.Canon.SerialNumber Long 2 1 0
Exif.Canon.FirmwareVersion Ascii 17 Whatever version
Exif.Canon.FocalLength Short 4 2 227 286 215
Exif.CanonSi.AutoISO Short 1 100
Expand Down Expand Up @@ -134,7 +134,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition
Exif.Canon.OwnerName Ascii 15 Andreas Huggel
Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.AutoISO Short 1 100
Expand Down Expand Up @@ -207,7 +207,7 @@ Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 18:54:36
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.SerialNumber Long 2 1135765596 1446117789
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.AutoISO Short 1 100
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/exiv2-bug1140.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 32 Canon EOS 30D Canon EOS 30D
Exif.Canon.FirmwareVersion Ascii 32 Firmware 1.0.5 Firmware 1.0.5
Exif.Canon.OwnerName Ascii 32 unknown unknown
Exif.Canon.SerialNumber Long 1 1520906211 5aa712259
Exif.Canon.SerialNumber Long 1 1520906211 1520906211
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
Exif.CanonCf.NoiseReduction Short 1 256 256
Exif.CanonCf.ShutterAeLock Short 1 513 513
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/exiv2-bug1202.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Exif.CanonFi.RawJpgSize SShort 1 -1 n/a
Exif.CanonFi.NoiseReduction SShort 1 -1 (-1)
Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG IMG:EOS 300D DIGITAL JPEG
Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 Firmware Version 1.0.2
Exif.Canon.SerialNumber Long 1 570004681 21f938089
Exif.Canon.SerialNumber Long 1 570004681 570004681
Exif.Canon.SerialNumberFormat Long 1 2415919104 Format 1
Exif.Canon.FileNumber Long 1 1030390 103-0390
Exif.Canon.OwnerName Ascii 32
Expand Down
Loading
Loading