From 9c824f2c0456963807fd14d174d447a9c958e9b5 Mon Sep 17 00:00:00 2001 From: norbertwg Date: Wed, 25 Oct 2023 15:01:06 +0200 Subject: [PATCH 1/2] 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 (cherry picked from commit b1b9e74df87ff299deae5d269ce6d55d04d78410) --- src/canonmn_int.cpp | 20 +++++++++++++++++-- src/canonmn_int.hpp | 2 ++ .../CanonEF100mmF2.8LMacroISUSM.exv.out | 2 +- .../TamronSP90mmF2.8DiVCUSDMacroF004.exv.out | 2 +- test/data/test_reference_files/crw-test.out | 8 ++++---- .../exiv2-bug1140.exv.out | 2 +- .../exiv2-bug1202.jpg.out | 2 +- .../exiv2-canon-eos-20d.jpg.out | 2 +- .../exiv2-canon-eos-300d.jpg.out | 2 +- .../exiv2-canon-powershot-s40.crw.out | 2 +- test/data/test_reference_files/exiv2-test.out | 20 +++++++++---------- .../issue_1763_poc.exv.out | 2 +- .../test_reference_files/template.exv.out | 2 +- .../test_issue_981a.exv.out | 2 +- tests/bash_tests/test_easyaccess.py | 2 +- 15 files changed, 45 insertions(+), 27 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index e0b96f64f6..e244bedbcc 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -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, @@ -2630,7 +2630,7 @@ 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; @@ -2638,6 +2638,22 @@ std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, << 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()); + + 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; diff --git a/src/canonmn_int.hpp b/src/canonmn_int.hpp index 2e137fe57c..63d764541c 100644 --- a/src/canonmn_int.hpp +++ b/src/canonmn_int.hpp @@ -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 diff --git a/test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out b/test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out index 6cb284f074..5a22901112 100644 --- a/test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out +++ b/test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out @@ -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 diff --git a/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out b/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out index f23e09a47d..27a7cb83a0 100644 --- a/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out +++ b/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out @@ -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 diff --git a/test/data/test_reference_files/crw-test.out b/test/data/test_reference_files/crw-test.out index 0b74c059c8..e9ffb19587 100644 --- a/test/data/test_reference_files/crw-test.out +++ b/test/data/test_reference_files/crw-test.out @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/test/data/test_reference_files/exiv2-bug1140.exv.out b/test/data/test_reference_files/exiv2-bug1140.exv.out index 0824463add..a54e7d20b3 100644 --- a/test/data/test_reference_files/exiv2-bug1140.exv.out +++ b/test/data/test_reference_files/exiv2-bug1140.exv.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-bug1202.jpg.out b/test/data/test_reference_files/exiv2-bug1202.jpg.out index d8a376bedf..6f1d2b9518 100644 --- a/test/data/test_reference_files/exiv2-bug1202.jpg.out +++ b/test/data/test_reference_files/exiv2-bug1202.jpg.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out b/test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out index 6e613631e0..98e74581f5 100644 --- a/test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out +++ b/test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out @@ -91,7 +91,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0 Exif.Canon.ImageType Ascii 32 Canon EOS 20D Canon EOS 20D Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 Firmware 2.0.3 Exif.Canon.OwnerName Ascii 32 unknown unknown -Exif.Canon.SerialNumber Long 1 1731000068 672c63236 +Exif.Canon.SerialNumber Long 1 1731000068 1731000068 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 1 1 Exif.CanonCf.ShutterAeLock Short 1 256 256 diff --git a/test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out b/test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out index b7867d8921..9692ee9eb3 100644 --- a/test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out +++ b/test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out @@ -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 diff --git a/test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out b/test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out index 72136e5b88..4c4f024609 100644 --- a/test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out +++ b/test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out @@ -10,7 +10,7 @@ Exif.Canon.ImageType Ascii 30 CRW:High definition Exif.Canon.OwnerName Ascii 15 Andreas Huggel Andreas Huggel Exif.Image.Make Ascii 6 Canon Canon Exif.Image.Model Ascii 20 Canon PowerShot S40 Canon PowerShot S40 -Exif.Canon.SerialNumber Long 2 1135765596 1446117789 43b226716 +Exif.Canon.SerialNumber Long 2 1135765596 1446117789 1135765596 1446117789 Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10 Firmware Version 1.10 Exif.Canon.FocalLength Short 4 2 227 286 215 7.1 mm Exif.CanonSi.AutoISO Short 1 0 100 diff --git a/test/data/test_reference_files/exiv2-test.out b/test/data/test_reference_files/exiv2-test.out index 8104624561..b89a78907f 100644 --- a/test/data/test_reference_files/exiv2-test.out +++ b/test/data/test_reference_files/exiv2-test.out @@ -1192,7 +1192,7 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonFi.NoiseReduction SShort 1 (-1) 20030925_201850.jpg Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG 20030925_201850.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 -20030925_201850.jpg Exif.Canon.SerialNumber Long 1 21f938089 +20030925_201850.jpg Exif.Canon.SerialNumber Long 1 570004681 20030925_201850.jpg Exif.Canon.SerialNumberFormat Long 1 Format 1 20030925_201850.jpg Exif.Canon.FileNumber Long 1 103-0390 20030925_201850.jpg Exif.Canon.OwnerName Ascii 32 @@ -1779,7 +1779,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Exif.Canon.ImageType Ascii 32 Canon EOS 20D 20060802_095200.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 20060802_095200.jpg Exif.Canon.OwnerName Ascii 32 unknown -20060802_095200.jpg Exif.Canon.SerialNumber Long 1 672c63236 +20060802_095200.jpg Exif.Canon.SerialNumber Long 1 1731000068 20060802_095200.jpg 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 20060802_095200.jpg Exif.CanonCf.0x0000 Short 1 38 20060802_095200.jpg Exif.CanonCf.NoiseReduction Short 1 1 @@ -2833,7 +2833,7 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonFi.NoiseReduction SShort 1 (-1) < 20030925_201850.jpg Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG < 20030925_201850.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 -< 20030925_201850.jpg Exif.Canon.SerialNumber Long 1 21f938089 +< 20030925_201850.jpg Exif.Canon.SerialNumber Long 1 570004681 < 20030925_201850.jpg Exif.Canon.SerialNumberFormat Long 1 Format 1 < 20030925_201850.jpg Exif.Canon.FileNumber Long 1 103-0390 < 20030925_201850.jpg Exif.Canon.OwnerName Ascii 32 @@ -3419,7 +3419,7 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.Canon.ImageType Ascii 32 Canon EOS 20D < 20060802_095200.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 < 20060802_095200.jpg Exif.Canon.OwnerName Ascii 32 unknown -< 20060802_095200.jpg Exif.Canon.SerialNumber Long 1 672c63236 +< 20060802_095200.jpg Exif.Canon.SerialNumber Long 1 1731000068 < 20060802_095200.jpg 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 < 20060802_095200.jpg Exif.CanonCf.0x0000 Short 1 38 < 20060802_095200.jpg Exif.CanonCf.NoiseReduction Short 1 1 @@ -4396,7 +4396,7 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonFi.NoiseReduction SShort 1 (-1) > 20030925_201850.exv Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG > 20030925_201850.exv Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 -> 20030925_201850.exv Exif.Canon.SerialNumber Long 1 21f938089 +> 20030925_201850.exv Exif.Canon.SerialNumber Long 1 570004681 > 20030925_201850.exv Exif.Canon.SerialNumberFormat Long 1 Format 1 > 20030925_201850.exv Exif.Canon.FileNumber Long 1 103-0390 > 20030925_201850.exv Exif.Canon.OwnerName Ascii 32 @@ -4982,7 +4982,7 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.Canon.ImageType Ascii 32 Canon EOS 20D > 20060802_095200.exv Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 > 20060802_095200.exv Exif.Canon.OwnerName Ascii 32 unknown -> 20060802_095200.exv Exif.Canon.SerialNumber Long 1 672c63236 +> 20060802_095200.exv Exif.Canon.SerialNumber Long 1 1731000068 > 20060802_095200.exv 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 > 20060802_095200.exv Exif.CanonCf.0x0000 Short 1 38 > 20060802_095200.exv Exif.CanonCf.NoiseReduction Short 1 1 @@ -6197,7 +6197,7 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonFi.NoiseReduction SShort 1 (-1) < 20030925_201850.jpg Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG < 20030925_201850.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 -< 20030925_201850.jpg Exif.Canon.SerialNumber Long 1 21f938089 +< 20030925_201850.jpg Exif.Canon.SerialNumber Long 1 570004681 < 20030925_201850.jpg Exif.Canon.SerialNumberFormat Long 1 Format 1 < 20030925_201850.jpg Exif.Canon.FileNumber Long 1 103-0390 < 20030925_201850.jpg Exif.Canon.OwnerName Ascii 32 @@ -6783,7 +6783,7 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.Canon.ImageType Ascii 32 Canon EOS 20D < 20060802_095200.jpg Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 < 20060802_095200.jpg Exif.Canon.OwnerName Ascii 32 unknown -< 20060802_095200.jpg Exif.Canon.SerialNumber Long 1 672c63236 +< 20060802_095200.jpg Exif.Canon.SerialNumber Long 1 1731000068 < 20060802_095200.jpg 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 < 20060802_095200.jpg Exif.CanonCf.0x0000 Short 1 38 < 20060802_095200.jpg Exif.CanonCf.NoiseReduction Short 1 1 @@ -7760,7 +7760,7 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonFi.NoiseReduction SShort 1 (-1) > 20030925_201850.exv Exif.Canon.ImageType Ascii 32 IMG:EOS 300D DIGITAL JPEG > 20030925_201850.exv Exif.Canon.FirmwareVersion Ascii 32 Firmware Version 1.0.2 -> 20030925_201850.exv Exif.Canon.SerialNumber Long 1 21f938089 +> 20030925_201850.exv Exif.Canon.SerialNumber Long 1 570004681 > 20030925_201850.exv Exif.Canon.SerialNumberFormat Long 1 Format 1 > 20030925_201850.exv Exif.Canon.FileNumber Long 1 103-0390 > 20030925_201850.exv Exif.Canon.OwnerName Ascii 32 @@ -8346,7 +8346,7 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.Canon.ImageType Ascii 32 Canon EOS 20D > 20060802_095200.exv Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 > 20060802_095200.exv Exif.Canon.OwnerName Ascii 32 unknown -> 20060802_095200.exv Exif.Canon.SerialNumber Long 1 672c63236 +> 20060802_095200.exv Exif.Canon.SerialNumber Long 1 1731000068 > 20060802_095200.exv 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 > 20060802_095200.exv Exif.CanonCf.0x0000 Short 1 38 > 20060802_095200.exv Exif.CanonCf.NoiseReduction Short 1 1 diff --git a/test/data/test_reference_files/issue_1763_poc.exv.out b/test/data/test_reference_files/issue_1763_poc.exv.out index b904f6d24b..0790f9cde5 100644 --- a/test/data/test_reference_files/issue_1763_poc.exv.out +++ b/test/data/test_reference_files/issue_1763_poc.exv.out @@ -76,7 +76,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 diff --git a/test/data/test_reference_files/template.exv.out b/test/data/test_reference_files/template.exv.out index 7dff8c648e..b826b12f46 100644 --- a/test/data/test_reference_files/template.exv.out +++ b/test/data/test_reference_files/template.exv.out @@ -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 diff --git a/test/data/test_reference_files/test_issue_981a.exv.out b/test/data/test_reference_files/test_issue_981a.exv.out index 46e59eb13b..4753788568 100644 --- a/test/data/test_reference_files/test_issue_981a.exv.out +++ b/test/data/test_reference_files/test_issue_981a.exv.out @@ -93,7 +93,7 @@ Exif.CanonSi.FlashOutput Short 1 0 0 Exif.Canon.ImageType Ascii 15 Canon EOS 500D Canon EOS 500D Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.1.1 Firmware Version 1.1.1 Exif.Canon.OwnerName Ascii 32 -Exif.Canon.SerialNumber Long 1 780145265 2e8004721 +Exif.Canon.SerialNumber Long 1 780145265 780145265 Exif.Canon.CameraInfo Undefined 1536 170 170 83 50 83 51 104 0 82 88 3 3 0 0 0 0 0 0 1 0 0 6 0 0 0 153 0 87 93 0 0 200 0 1 0 0 0 0 1 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 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 224 12 204 204 2 0 0 0 3 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 100 25 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 3 0 0 0 3 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 131 0 0 0 1 0 0 0 1 0 0 0 13 0 1 0 2 0 0 0 1 0 0 0 0 0 255 255 5 0 0 0 0 255 255 255 8 0 0 0 0 0 0 0 6 7 0 0 0 0 255 255 9 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 1 50 93 0 137 0 18 0 200 145 21 0 0 0 0 0 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 1 0 0 0 161 18 0 0 96 12 0 0 99 8 0 0 243 4 0 0 218 1 0 0 122 2 0 0 208 2 0 0 224 1 0 0 0 0 0 0 0 0 0 0 208 2 0 0 169 1 0 0 48 182 134 0 48 152 134 0 48 184 134 0 255 255 255 255 255 255 255 255 28 207 13 255 1 0 0 0 255 255 255 255 255 255 255 255 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 10 2 0 1 0 1 0 49 46 49 46 49 0 52 65 40 48 49 41 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 142 0 0 0 100 0 0 0 100 0 0 0 0 0 0 0 175 29 0 0 0 0 0 0 100 0 0 0 101 0 0 0 100 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 2 0 0 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 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 0 0 0 0 0 0 0 0 0 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 0 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 205 190 81 93 90 1 0 0 4 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 16 0 0 0 0 0 0 0 0 86 40 8 181 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 83 50 83 51 104 0 82 88 3 3 0 0 0 0 0 0 1 0 0 6 0 0 0 153 0 87 93 0 0 200 0 1 0 0 0 0 1 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 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 224 12 204 204 2 0 0 0 3 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 100 25 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 3 0 0 0 3 0 0 0 3 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 131 0 0 0 1 0 0 0 1 0 0 0 13 0 1 0 2 0 0 0 1 0 0 0 0 0 255 255 5 0 0 0 0 255 255 255 8 0 0 0 0 0 0 0 6 7 0 0 0 0 255 255 9 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 1 50 93 0 137 0 18 0 200 145 21 0 0 0 0 0 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 1 0 0 0 161 18 0 0 96 12 0 0 99 8 0 0 243 4 0 0 218 1 0 0 122 2 0 0 208 2 0 0 224 1 0 0 0 0 0 0 0 0 0 0 208 2 0 0 169 1 0 0 48 182 134 0 48 152 134 0 48 184 134 0 255 255 255 255 255 255 255 255 28 207 13 255 1 0 0 0 255 255 255 255 255 255 255 255 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 10 2 0 1 0 1 0 49 46 49 46 49 0 52 65 40 48 49 41 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 142 0 0 0 100 0 0 0 100 0 0 0 0 0 0 0 175 29 0 0 0 0 0 0 100 0 0 0 101 0 0 0 100 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 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 244 1 0 4 0 4 215 2 0 0 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 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 0 0 0 0 0 0 0 0 0 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 0 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 205 190 81 93 90 1 0 0 4 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 16 0 0 0 0 0 0 0 0 86 40 8 181 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 2147484242 EOS Rebel T1i / 500D / Kiss X3 Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 0 159 7 112 diff --git a/tests/bash_tests/test_easyaccess.py b/tests/bash_tests/test_easyaccess.py index 23af362a42..c3d9fddd32 100644 --- a/tests/bash_tests/test_easyaccess.py +++ b/tests/bash_tests/test_easyaccess.py @@ -98,7 +98,7 @@ class Canon1(metaclass=CaseMeta): Subject distance (Exif.CanonSi.SubjectDistance ) : Infinite Light source ( ) : Flash (Exif.Photo.Flash ) : No flash -Camera serial number (Exif.Canon.SerialNumber ) : 21f938089 +Camera serial number (Exif.Canon.SerialNumber ) : 570004681 Focal length (Exif.Photo.FocalLength ) : 18.0 mm Subject location/area ( ) : Flash energy ( ) : From 956efd97f0b80aa644efdaa0c2840f9f7c5b4982 Mon Sep 17 00:00:00 2001 From: norbertwg Date: Thu, 16 May 2024 17:41:40 +0200 Subject: [PATCH 2/2] check if exifdata is not null (cherry picked from commit 9e46ae31b1dbec7d8c05679d2f0db1830a5fb0e1) --- src/canonmn_int.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index e244bedbcc..84e365e01f 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -2641,6 +2641,10 @@ std::ostream& CanonMakerNote::print0x000a(std::ostream& os, const Value& value, 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