From 02e181eca70f4ee839a828dafca5c150f879eab3 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Thu, 8 Jul 2010 15:41:05 +0000 Subject: [PATCH] Added patch for MeasuredEV in CanonSi (Axel Waggershauser) and several checks for the size of a tag value. --- src/canonmn.cpp | 79 +++++++++++++++++++++++----- src/canonmn.hpp | 4 ++ test/data/bugfixes-test.out | Bin 70017 -> 70023 bytes test/data/exifdata-test.out | 16 +++--- test/data/exiv2-test.out | 100 ++++++++++++++++++------------------ test/data/write2-test.out | 4 +- 6 files changed, 129 insertions(+), 74 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 6ae97a8d..6b3d1cc7 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -754,7 +754,7 @@ namespace Exiv2 { const TagInfo CanonMakerNote::tagInfoSi_[] = { TagInfo(0x0001, "0x0001", "0x0001", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0002, "ISOSpeed", N_("ISO Speed Used"), N_("ISO speed used"), canonSiIfdId, makerTags, unsignedShort, printSi0x0002), - TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0003, "MeasuredEV", N_("Measured EV"), N_("Measured EV"), canonSiIfdId, makerTags, unsignedShort, printSi0x0003), TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015), TagInfo(0x0005, "TargetShutterSpeed", N_("Target Shutter Speed"), N_("Target shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016), TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), @@ -774,7 +774,7 @@ namespace Exiv2 { TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015), TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016), - TagInfo(0x0017, "0x0017", "0x0017", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0017, "MeasuredEV2", N_("Measured EV 2"), N_("Measured EV 2"), canonSiIfdId, makerTags, unsignedShort, printSi0x0017), TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), @@ -960,7 +960,9 @@ namespace Exiv2 { const Value& value, const ExifData* metadata) { - if (!metadata || value.typeId() != unsignedLong) return os << "(" << value << ")"; + if ( !metadata || value.typeId() != unsignedLong + || value.count() == 0) return os << "(" << value << ")"; + ExifData::const_iterator pos = metadata->findKey(ExifKey("Exif.Image.Model")); if (pos == metadata->end()) return os << "(" << value << ")"; @@ -1047,7 +1049,9 @@ namespace Exiv2 { const Value& value, const ExifData*) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; + long l = value.toLong(); if (l == 0) { os << "Off"; @@ -1074,7 +1078,8 @@ namespace Exiv2 { const Value& value, const ExifData* metadata) { - if (!metadata || value.typeId() != unsignedShort) return os << value; + if ( !metadata || value.typeId() != unsignedShort + || value.count() == 0) return os << value; LensTypeAndFocalLength ltfl; ltfl.lensType_ = value.toLong(); @@ -1109,7 +1114,8 @@ namespace Exiv2 { const Value& value, const ExifData* metadata) { - if (value.typeId() != unsignedShort) return os << "(" << value << ")"; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << "(" << value << ")"; const LensIdFct* lif = find(lensIdFct, value.toLong()); if (!lif) { @@ -1150,15 +1156,40 @@ namespace Exiv2 { const Value& value, const ExifData*) { - // Ported from Exiftool by Will Stokes - return os << exp(canonEv(value.toLong()) * log(2.0)) * 100.0 / 32.0; + if ( value.typeId() == unsignedShort + && value.count() > 0) { + // Ported from Exiftool by Will Stokes + os << exp(canonEv(value.toLong()) * log(2.0)) * 100.0 / 32.0; + } + return os; + } + + std::ostream& CanonMakerNote::printSi0x0003(std::ostream& os, + const Value& value, + const ExifData*) + { + if ( value.typeId() == unsignedShort + && value.count() > 0) { + // The offset of '5' seems to be ok for most Canons (see Exiftool) + // It might be explained by the fakt, that most Canons have a longest + // exposure of 30s which is 5 EV below 1s + // see also printSi0x0017 + std::ostringstream oss; + oss.copyfmt(os); + os << std::fixed << std::setprecision(2) + << value.toLong() / 32.0 + 5.0; + os.copyfmt(oss); + } + return os; } std::ostream& CanonMakerNote::printSi0x0009(std::ostream& os, const Value& value, const ExifData*) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; + long l = value.toLong(); os << l << ""; // Todo: determine unit @@ -1169,7 +1200,9 @@ namespace Exiv2 { const Value& value, const ExifData* pExifData) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; + long l = value.toLong(); long num = (l & 0xf000) >> 12; os << num << " focus points; "; @@ -1188,7 +1221,9 @@ namespace Exiv2 { const Value& value, const ExifData*) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; + long l = value.toLong(); if (l == 0xffff) { os << "Infinite"; @@ -1203,7 +1238,8 @@ namespace Exiv2 { const Value& value, const ExifData*) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; std::ostringstream oss; oss.copyfmt(os); @@ -1212,7 +1248,6 @@ namespace Exiv2 { os << std::setprecision(2) << "F" << fnumber(canonEv(val)); os.copyfmt(oss); - return os; } @@ -1220,7 +1255,8 @@ namespace Exiv2 { const Value& value, const ExifData*) { - if (value.typeId() != unsignedShort) return os << value; + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; URational ur = exposureTime(canonEv(value.toLong())); os << ur.first; @@ -1230,6 +1266,21 @@ namespace Exiv2 { return os << " s"; } + std::ostream& CanonMakerNote::printSi0x0017(std::ostream& os, + const Value& value, + const ExifData*) + { + if ( value.typeId() != unsignedShort + || value.count() == 0) return os << value; + + std::ostringstream oss; + oss.copyfmt(os); + os << std::fixed << std::setprecision(2) + << value.toLong() / 8.0 - 6.0; + os.copyfmt(oss); + return os; + } + // ***************************************************************************** // free functions diff --git a/src/canonmn.hpp b/src/canonmn.hpp index abae46bd..6e1e5bb9 100644 --- a/src/canonmn.hpp +++ b/src/canonmn.hpp @@ -91,6 +91,8 @@ namespace Exiv2 { static std::ostream& printCsLens(std::ostream& os, const Value& value, const ExifData*); //! ISO speed used static std::ostream& printSi0x0002(std::ostream& os, const Value& value, const ExifData*); + //! MeasuredEV + static std::ostream& printSi0x0003(std::ostream& os, const Value& value, const ExifData*); //! Sequence number static std::ostream& printSi0x0009(std::ostream& os, const Value& value, const ExifData*); //! AF point used @@ -101,6 +103,8 @@ namespace Exiv2 { static std::ostream& printSi0x0015(std::ostream& os, const Value& value, const ExifData*); //! Shutter speed static std::ostream& printSi0x0016(std::ostream& os, const Value& value, const ExifData*); + //! MeasuredEV2 + static std::ostream& printSi0x0017(std::ostream& os, const Value& value, const ExifData*); //@} private: diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index 2dc0a54166e17ced90b195389b89f659d4edf785..216a5703d6649ab6714340f56f7ddd54dd89e74c 100644 GIT binary patch delta 65 zcmZo%%+kJ?WrKw&mv3rfacNO%ifhnyawr Nn&}yAF0>N34gkFI6qo=2 delta 49 zcmZo)%+k1+WrKw&n?Z$vfr0VlMm|kuBXhIOIi@#Qz+#5xAhF3hX8fDmtQfBY0C(jN A5&!@I diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out index 1357b586..031a9468 100644 --- a/test/data/exifdata-test.out +++ b/test/data/exifdata-test.out @@ -235,7 +235,7 @@ Exif.Canon.0x0003 0x0003 Makernote Short 4 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 160 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 276 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 276 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 149 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 287 Exif.CanonSi.0x0006 0x0006 Makernote Short 1 0 @@ -255,7 +255,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1 Exif.CanonSi.0x0014 0x0014 Makernote Short 1 0 Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149 Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289 -Exif.CanonSi.0x0017 0x0017 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0 Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0 Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0 Exif.CanonSi.0x001a 0x001a Makernote Short 1 250 @@ -364,7 +364,7 @@ Exif.Canon.0x0003 0x0003 Makernote Short 4 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 160 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 276 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 276 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 149 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 287 Exif.CanonSi.0x0006 0x0006 Makernote Short 1 0 @@ -384,7 +384,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1 Exif.CanonSi.0x0014 0x0014 Makernote Short 1 0 Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149 Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289 -Exif.CanonSi.0x0017 0x0017 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0 Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0 Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0 Exif.CanonSi.0x001a 0x001a Makernote Short 1 250 @@ -494,7 +494,7 @@ Exif.Canon.0x0003 0x0003 Makernote Short 4 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 160 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 276 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 276 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 149 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 287 Exif.CanonSi.0x0006 0x0006 Makernote Short 1 0 @@ -514,7 +514,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1 Exif.CanonSi.0x0014 0x0014 Makernote Short 1 0 Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149 Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289 -Exif.CanonSi.0x0017 0x0017 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0 Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0 Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0 Exif.CanonSi.0x001a 0x001a Makernote Short 1 250 @@ -624,7 +624,7 @@ Exif.Canon.0x0003 0x0003 Makernote Short 4 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 160 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 276 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 276 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 149 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 287 Exif.CanonSi.0x0006 0x0006 Makernote Short 1 0 @@ -644,7 +644,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1 Exif.CanonSi.0x0014 0x0014 Makernote Short 1 0 Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149 Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289 -Exif.CanonSi.0x0017 0x0017 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0 Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0 Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0 Exif.CanonSi.0x001a 0x001a Makernote Short 1 250 diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 9a34ce4e..a8cd28cd 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -672,7 +672,7 @@ File 2/15: 20031214_000043.jpg 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -20031214_000043.jpg Exif.CanonSi.0x0003 Short 1 276 +20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -692,7 +692,7 @@ File 2/15: 20031214_000043.jpg 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 20031214_000043.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s -20031214_000043.jpg Exif.CanonSi.0x0017 Short 1 0 +20031214_000043.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 20031214_000043.jpg Exif.CanonSi.0x0018 Short 1 0 20031214_000043.jpg Exif.CanonSi.0x0019 Short 1 0 20031214_000043.jpg Exif.CanonSi.0x001a Short 1 250 @@ -1096,7 +1096,7 @@ File 6/15: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66 20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0 20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100 -20030925_201850.jpg Exif.CanonSi.0x0003 Short 1 200 +20030925_201850.jpg Exif.CanonSi.MeasuredEV Short 1 11.25 20030925_201850.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 20030925_201850.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/79 s 20030925_201850.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -1116,7 +1116,7 @@ File 6/15: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 20030925_201850.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/81 s -20030925_201850.jpg Exif.CanonSi.0x0017 Short 1 140 +20030925_201850.jpg Exif.CanonSi.MeasuredEV2 Short 1 11.50 20030925_201850.jpg Exif.CanonSi.0x0018 Short 1 0 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 20030925_201850.jpg Exif.CanonSi.0x001a Short 1 252 @@ -1689,7 +1689,7 @@ Error: Directory Canon: Next pointer is out of bounds; ignored. 20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68 20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0 20060802_095200.jpg Exif.CanonSi.ISOSpeed Short 1 100 -20060802_095200.jpg Exif.CanonSi.0x0003 Short 1 8 +20060802_095200.jpg Exif.CanonSi.MeasuredEV Short 1 5.25 20060802_095200.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 20060802_095200.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/60 s 20060802_095200.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -1709,7 +1709,7 @@ Error: Directory Canon: Next pointer is out of bounds; ignored. 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 20060802_095200.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/2048 s -20060802_095200.jpg Exif.CanonSi.0x0017 Short 1 87 +20060802_095200.jpg Exif.CanonSi.MeasuredEV2 Short 1 4.88 20060802_095200.jpg Exif.CanonSi.0x0018 Short 1 0 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 20060802_095200.jpg Exif.CanonSi.0x001a Short 1 252 @@ -1884,7 +1884,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 -20001004_015404.jpg Exif.CanonSi.0x0003 Short 1 248 +20001004_015404.jpg Exif.CanonSi.MeasuredEV Short 1 12.75 20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4 20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s 20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -1904,7 +1904,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 20001004_015404.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/431 s -20001004_015404.jpg Exif.CanonSi.0x0017 Short 1 154 +20001004_015404.jpg Exif.CanonSi.MeasuredEV2 Short 1 13.25 20001004_015404.jpg Exif.CanonSi.0x0018 Short 1 0 20001004_015404.jpg Exif.Canon.0x0000 Short 6 0 0 0 0 0 0 20001004_015404.jpg Exif.Canon.0x000a Short 59 118 8 8 0 0 12 7970 63771 12886 5201 28427 28912 13362 52780 584 8689 41493 288 8099 2844 12933 6065 60947 404 13298 55853 12878 9473 56351 4511 8115 1819 29306 6194 4629 25042 13378 59693 16980 9329 56351 33193 8003 5147 17037 6098 7445 41427 13426 60717 53852 9473 58656 45479 4 126 127 126 127 @@ -2027,7 +2027,7 @@ File 15/15: 20060127_225027.jpg 20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68 20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0 20060127_225027.jpg Exif.CanonSi.ISOSpeed Short 1 50 -20060127_225027.jpg Exif.CanonSi.0x0003 Short 1 320 +20060127_225027.jpg Exif.CanonSi.MeasuredEV Short 1 15.00 20060127_225027.jpg Exif.CanonSi.TargetAperture Short 1 F4 20060127_225027.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/1002 s 20060127_225027.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -2047,7 +2047,7 @@ File 15/15: 20060127_225027.jpg 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 20060127_225027.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/1024 s -20060127_225027.jpg Exif.CanonSi.0x0017 Short 1 0 +20060127_225027.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 20060127_225027.jpg Exif.CanonSi.0x0018 Short 1 0 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 20060127_225027.jpg Exif.CanonSi.0x001a Short 1 250 @@ -2272,7 +2272,7 @@ Compare image data and extracted data ------------------------------------ < 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 < 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20031214_000043.jpg Exif.CanonSi.0x0003 Short 1 276 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 < 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s < 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -2292,7 +2292,7 @@ Compare image data and extracted data ------------------------------------ < 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s -< 20031214_000043.jpg Exif.CanonSi.0x0017 Short 1 0 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 < 20031214_000043.jpg Exif.CanonSi.0x0018 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.0x0019 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.0x001a Short 1 250 @@ -2696,7 +2696,7 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66 < 20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20030925_201850.jpg Exif.CanonSi.0x0003 Short 1 200 +< 20030925_201850.jpg Exif.CanonSi.MeasuredEV Short 1 11.25 < 20030925_201850.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 < 20030925_201850.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/79 s < 20030925_201850.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -2716,7 +2716,7 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 < 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 < 20030925_201850.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/81 s -< 20030925_201850.jpg Exif.CanonSi.0x0017 Short 1 140 +< 20030925_201850.jpg Exif.CanonSi.MeasuredEV2 Short 1 11.50 < 20030925_201850.jpg Exif.CanonSi.0x0018 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x001a Short 1 252 @@ -3288,7 +3288,7 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68 < 20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20060802_095200.jpg Exif.CanonSi.0x0003 Short 1 8 +< 20060802_095200.jpg Exif.CanonSi.MeasuredEV Short 1 5.25 < 20060802_095200.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 < 20060802_095200.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/60 s < 20060802_095200.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -3308,7 +3308,7 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 < 20060802_095200.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/2048 s -< 20060802_095200.jpg Exif.CanonSi.0x0017 Short 1 87 +< 20060802_095200.jpg Exif.CanonSi.MeasuredEV2 Short 1 4.88 < 20060802_095200.jpg Exif.CanonSi.0x0018 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x001a Short 1 252 @@ -3483,7 +3483,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 < 20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20001004_015404.jpg Exif.CanonSi.0x0003 Short 1 248 +< 20001004_015404.jpg Exif.CanonSi.MeasuredEV Short 1 12.75 < 20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4 < 20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s < 20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -3503,7 +3503,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 < 20001004_015404.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/431 s -< 20001004_015404.jpg Exif.CanonSi.0x0017 Short 1 154 +< 20001004_015404.jpg Exif.CanonSi.MeasuredEV2 Short 1 13.25 < 20001004_015404.jpg Exif.CanonSi.0x0018 Short 1 0 < 20001004_015404.jpg Exif.Canon.0x0000 Short 6 0 0 0 0 0 0 < 20001004_015404.jpg Exif.Canon.0x000a Short 59 118 8 8 0 0 12 7970 63771 12886 5201 28427 28912 13362 52780 584 8689 41493 288 8099 2844 12933 6065 60947 404 13298 55853 12878 9473 56351 4511 8115 1819 29306 6194 4629 25042 13378 59693 16980 9329 56351 33193 8003 5147 17037 6098 7445 41427 13426 60717 53852 9473 58656 45479 4 126 127 126 127 @@ -3626,7 +3626,7 @@ Compare image data and extracted data ------------------------------------ < 20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68 < 20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ISOSpeed Short 1 50 -< 20060127_225027.jpg Exif.CanonSi.0x0003 Short 1 320 +< 20060127_225027.jpg Exif.CanonSi.MeasuredEV Short 1 15.00 < 20060127_225027.jpg Exif.CanonSi.TargetAperture Short 1 F4 < 20060127_225027.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/1002 s < 20060127_225027.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -3646,7 +3646,7 @@ Compare image data and extracted data ------------------------------------ < 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 < 20060127_225027.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/1024 s -< 20060127_225027.jpg Exif.CanonSi.0x0017 Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 < 20060127_225027.jpg Exif.CanonSi.0x0018 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x001a Short 1 250 @@ -3800,7 +3800,7 @@ Compare image data and extracted data ------------------------------------ > 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54 > 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20031214_000043.exv Exif.CanonSi.0x0003 Short 1 276 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.62 > 20031214_000043.exv Exif.CanonSi.TargetAperture Short 1 F5 > 20031214_000043.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s > 20031214_000043.exv Exif.CanonSi.0x0006 Short 1 0 @@ -3820,7 +3820,7 @@ Compare image data and extracted data ------------------------------------ > 20031214_000043.exv Exif.CanonSi.0x0014 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ApertureValue Short 1 F5 > 20031214_000043.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s -> 20031214_000043.exv Exif.CanonSi.0x0017 Short 1 0 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV2 Short 1 -6.00 > 20031214_000043.exv Exif.CanonSi.0x0018 Short 1 0 > 20031214_000043.exv Exif.CanonSi.0x0019 Short 1 0 > 20031214_000043.exv Exif.CanonSi.0x001a Short 1 250 @@ -4224,7 +4224,7 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66 > 20030925_201850.exv Exif.CanonSi.0x0001 Short 1 0 > 20030925_201850.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20030925_201850.exv Exif.CanonSi.0x0003 Short 1 200 +> 20030925_201850.exv Exif.CanonSi.MeasuredEV Short 1 11.25 > 20030925_201850.exv Exif.CanonSi.TargetAperture Short 1 F5.6 > 20030925_201850.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/79 s > 20030925_201850.exv Exif.CanonSi.0x0006 Short 1 0 @@ -4244,7 +4244,7 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonSi.0x0014 Short 1 546 > 20030925_201850.exv Exif.CanonSi.ApertureValue Short 1 F5.4 > 20030925_201850.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/81 s -> 20030925_201850.exv Exif.CanonSi.0x0017 Short 1 140 +> 20030925_201850.exv Exif.CanonSi.MeasuredEV2 Short 1 11.50 > 20030925_201850.exv Exif.CanonSi.0x0018 Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0019 Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x001a Short 1 252 @@ -4816,7 +4816,7 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.CanonSi.0x0000 Short 1 68 > 20060802_095200.exv Exif.CanonSi.0x0001 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20060802_095200.exv Exif.CanonSi.0x0003 Short 1 8 +> 20060802_095200.exv Exif.CanonSi.MeasuredEV Short 1 5.25 > 20060802_095200.exv Exif.CanonSi.TargetAperture Short 1 F5.6 > 20060802_095200.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/60 s > 20060802_095200.exv Exif.CanonSi.0x0006 Short 1 0 @@ -4836,7 +4836,7 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.CanonSi.0x0014 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ApertureValue Short 1 F5.4 > 20060802_095200.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/2048 s -> 20060802_095200.exv Exif.CanonSi.0x0017 Short 1 87 +> 20060802_095200.exv Exif.CanonSi.MeasuredEV2 Short 1 4.88 > 20060802_095200.exv Exif.CanonSi.0x0018 Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0019 Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x001a Short 1 252 @@ -5011,7 +5011,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50 > 20001004_015404.exv Exif.CanonSi.0x0001 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20001004_015404.exv Exif.CanonSi.0x0003 Short 1 248 +> 20001004_015404.exv Exif.CanonSi.MeasuredEV Short 1 12.75 > 20001004_015404.exv Exif.CanonSi.TargetAperture Short 1 F4 > 20001004_015404.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s > 20001004_015404.exv Exif.CanonSi.0x0006 Short 1 0 @@ -5031,7 +5031,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonSi.0x0014 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ApertureValue Short 1 F4 > 20001004_015404.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/431 s -> 20001004_015404.exv Exif.CanonSi.0x0017 Short 1 154 +> 20001004_015404.exv Exif.CanonSi.MeasuredEV2 Short 1 13.25 > 20001004_015404.exv Exif.CanonSi.0x0018 Short 1 0 > 20001004_015404.exv Exif.Canon.0x0000 Short 6 0 0 0 0 0 0 > 20001004_015404.exv Exif.Canon.0x000a Short 59 118 8 8 0 0 12 7970 63771 12886 5201 28427 28912 13362 52780 584 8689 41493 288 8099 2844 12933 6065 60947 404 13298 55853 12878 9473 56351 4511 8115 1819 29306 6194 4629 25042 13378 59693 16980 9329 56351 33193 8003 5147 17037 6098 7445 41427 13426 60717 53852 9473 58656 45479 4 126 127 126 127 @@ -5154,7 +5154,7 @@ Compare image data and extracted data ------------------------------------ > 20060127_225027.exv Exif.CanonSi.0x0000 Short 1 68 > 20060127_225027.exv Exif.CanonSi.0x0001 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ISOSpeed Short 1 50 -> 20060127_225027.exv Exif.CanonSi.0x0003 Short 1 320 +> 20060127_225027.exv Exif.CanonSi.MeasuredEV Short 1 15.00 > 20060127_225027.exv Exif.CanonSi.TargetAperture Short 1 F4 > 20060127_225027.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/1002 s > 20060127_225027.exv Exif.CanonSi.0x0006 Short 1 0 @@ -5174,7 +5174,7 @@ Compare image data and extracted data ------------------------------------ > 20060127_225027.exv Exif.CanonSi.0x0014 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ApertureValue Short 1 F4 > 20060127_225027.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/1024 s -> 20060127_225027.exv Exif.CanonSi.0x0017 Short 1 0 +> 20060127_225027.exv Exif.CanonSi.MeasuredEV2 Short 1 -6.00 > 20060127_225027.exv Exif.CanonSi.0x0018 Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0019 Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x001a Short 1 250 @@ -5548,7 +5548,7 @@ Compare original and inserted image data --------------------------------- < 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 < 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20031214_000043.jpg Exif.CanonSi.0x0003 Short 1 276 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 < 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s < 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -5568,7 +5568,7 @@ Compare original and inserted image data --------------------------------- < 20031214_000043.jpg Exif.CanonSi.0x0014 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ApertureValue Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s -< 20031214_000043.jpg Exif.CanonSi.0x0017 Short 1 0 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 < 20031214_000043.jpg Exif.CanonSi.0x0018 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.0x0019 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.0x001a Short 1 250 @@ -5972,7 +5972,7 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66 < 20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20030925_201850.jpg Exif.CanonSi.0x0003 Short 1 200 +< 20030925_201850.jpg Exif.CanonSi.MeasuredEV Short 1 11.25 < 20030925_201850.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 < 20030925_201850.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/79 s < 20030925_201850.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -5992,7 +5992,7 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonSi.0x0014 Short 1 546 < 20030925_201850.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 < 20030925_201850.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/81 s -< 20030925_201850.jpg Exif.CanonSi.0x0017 Short 1 140 +< 20030925_201850.jpg Exif.CanonSi.MeasuredEV2 Short 1 11.50 < 20030925_201850.jpg Exif.CanonSi.0x0018 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x001a Short 1 252 @@ -6564,7 +6564,7 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68 < 20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20060802_095200.jpg Exif.CanonSi.0x0003 Short 1 8 +< 20060802_095200.jpg Exif.CanonSi.MeasuredEV Short 1 5.25 < 20060802_095200.jpg Exif.CanonSi.TargetAperture Short 1 F5.6 < 20060802_095200.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/60 s < 20060802_095200.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -6584,7 +6584,7 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.ApertureValue Short 1 F5.4 < 20060802_095200.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/2048 s -< 20060802_095200.jpg Exif.CanonSi.0x0017 Short 1 87 +< 20060802_095200.jpg Exif.CanonSi.MeasuredEV2 Short 1 4.88 < 20060802_095200.jpg Exif.CanonSi.0x0018 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x001a Short 1 252 @@ -6759,7 +6759,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 < 20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20001004_015404.jpg Exif.CanonSi.0x0003 Short 1 248 +< 20001004_015404.jpg Exif.CanonSi.MeasuredEV Short 1 12.75 < 20001004_015404.jpg Exif.CanonSi.TargetAperture Short 1 F4 < 20001004_015404.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s < 20001004_015404.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -6779,7 +6779,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonSi.0x0014 Short 1 0 < 20001004_015404.jpg Exif.CanonSi.ApertureValue Short 1 F4 < 20001004_015404.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/431 s -< 20001004_015404.jpg Exif.CanonSi.0x0017 Short 1 154 +< 20001004_015404.jpg Exif.CanonSi.MeasuredEV2 Short 1 13.25 < 20001004_015404.jpg Exif.CanonSi.0x0018 Short 1 0 < 20001004_015404.jpg Exif.Canon.0x0000 Short 6 0 0 0 0 0 0 < 20001004_015404.jpg Exif.Canon.0x000a Short 59 118 8 8 0 0 12 7970 63771 12886 5201 28427 28912 13362 52780 584 8689 41493 288 8099 2844 12933 6065 60947 404 13298 55853 12878 9473 56351 4511 8115 1819 29306 6194 4629 25042 13378 59693 16980 9329 56351 33193 8003 5147 17037 6098 7445 41427 13426 60717 53852 9473 58656 45479 4 126 127 126 127 @@ -6902,7 +6902,7 @@ Compare original and inserted image data --------------------------------- < 20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68 < 20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ISOSpeed Short 1 50 -< 20060127_225027.jpg Exif.CanonSi.0x0003 Short 1 320 +< 20060127_225027.jpg Exif.CanonSi.MeasuredEV Short 1 15.00 < 20060127_225027.jpg Exif.CanonSi.TargetAperture Short 1 F4 < 20060127_225027.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/1002 s < 20060127_225027.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -6922,7 +6922,7 @@ Compare original and inserted image data --------------------------------- < 20060127_225027.jpg Exif.CanonSi.0x0014 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.ApertureValue Short 1 F4 < 20060127_225027.jpg Exif.CanonSi.ShutterSpeedValue Short 1 1/1024 s -< 20060127_225027.jpg Exif.CanonSi.0x0017 Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.MeasuredEV2 Short 1 -6.00 < 20060127_225027.jpg Exif.CanonSi.0x0018 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x001a Short 1 250 @@ -7076,7 +7076,7 @@ Compare original and inserted image data --------------------------------- > 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54 > 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20031214_000043.exv Exif.CanonSi.0x0003 Short 1 276 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.62 > 20031214_000043.exv Exif.CanonSi.TargetAperture Short 1 F5 > 20031214_000043.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s > 20031214_000043.exv Exif.CanonSi.0x0006 Short 1 0 @@ -7096,7 +7096,7 @@ Compare original and inserted image data --------------------------------- > 20031214_000043.exv Exif.CanonSi.0x0014 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ApertureValue Short 1 F5 > 20031214_000043.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s -> 20031214_000043.exv Exif.CanonSi.0x0017 Short 1 0 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV2 Short 1 -6.00 > 20031214_000043.exv Exif.CanonSi.0x0018 Short 1 0 > 20031214_000043.exv Exif.CanonSi.0x0019 Short 1 0 > 20031214_000043.exv Exif.CanonSi.0x001a Short 1 250 @@ -7500,7 +7500,7 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66 > 20030925_201850.exv Exif.CanonSi.0x0001 Short 1 0 > 20030925_201850.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20030925_201850.exv Exif.CanonSi.0x0003 Short 1 200 +> 20030925_201850.exv Exif.CanonSi.MeasuredEV Short 1 11.25 > 20030925_201850.exv Exif.CanonSi.TargetAperture Short 1 F5.6 > 20030925_201850.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/79 s > 20030925_201850.exv Exif.CanonSi.0x0006 Short 1 0 @@ -7520,7 +7520,7 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonSi.0x0014 Short 1 546 > 20030925_201850.exv Exif.CanonSi.ApertureValue Short 1 F5.4 > 20030925_201850.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/81 s -> 20030925_201850.exv Exif.CanonSi.0x0017 Short 1 140 +> 20030925_201850.exv Exif.CanonSi.MeasuredEV2 Short 1 11.50 > 20030925_201850.exv Exif.CanonSi.0x0018 Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0019 Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x001a Short 1 252 @@ -8092,7 +8092,7 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.CanonSi.0x0000 Short 1 68 > 20060802_095200.exv Exif.CanonSi.0x0001 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20060802_095200.exv Exif.CanonSi.0x0003 Short 1 8 +> 20060802_095200.exv Exif.CanonSi.MeasuredEV Short 1 5.25 > 20060802_095200.exv Exif.CanonSi.TargetAperture Short 1 F5.6 > 20060802_095200.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/60 s > 20060802_095200.exv Exif.CanonSi.0x0006 Short 1 0 @@ -8112,7 +8112,7 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.CanonSi.0x0014 Short 1 0 > 20060802_095200.exv Exif.CanonSi.ApertureValue Short 1 F5.4 > 20060802_095200.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/2048 s -> 20060802_095200.exv Exif.CanonSi.0x0017 Short 1 87 +> 20060802_095200.exv Exif.CanonSi.MeasuredEV2 Short 1 4.88 > 20060802_095200.exv Exif.CanonSi.0x0018 Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0019 Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x001a Short 1 252 @@ -8287,7 +8287,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50 > 20001004_015404.exv Exif.CanonSi.0x0001 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20001004_015404.exv Exif.CanonSi.0x0003 Short 1 248 +> 20001004_015404.exv Exif.CanonSi.MeasuredEV Short 1 12.75 > 20001004_015404.exv Exif.CanonSi.TargetAperture Short 1 F4 > 20001004_015404.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/347 s > 20001004_015404.exv Exif.CanonSi.0x0006 Short 1 0 @@ -8307,7 +8307,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonSi.0x0014 Short 1 0 > 20001004_015404.exv Exif.CanonSi.ApertureValue Short 1 F4 > 20001004_015404.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/431 s -> 20001004_015404.exv Exif.CanonSi.0x0017 Short 1 154 +> 20001004_015404.exv Exif.CanonSi.MeasuredEV2 Short 1 13.25 > 20001004_015404.exv Exif.CanonSi.0x0018 Short 1 0 > 20001004_015404.exv Exif.Canon.0x0000 Short 6 0 0 0 0 0 0 > 20001004_015404.exv Exif.Canon.0x000a Short 59 118 8 8 0 0 12 7970 63771 12886 5201 28427 28912 13362 52780 584 8689 41493 288 8099 2844 12933 6065 60947 404 13298 55853 12878 9473 56351 4511 8115 1819 29306 6194 4629 25042 13378 59693 16980 9329 56351 33193 8003 5147 17037 6098 7445 41427 13426 60717 53852 9473 58656 45479 4 126 127 126 127 @@ -8430,7 +8430,7 @@ Compare original and inserted image data --------------------------------- > 20060127_225027.exv Exif.CanonSi.0x0000 Short 1 68 > 20060127_225027.exv Exif.CanonSi.0x0001 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ISOSpeed Short 1 50 -> 20060127_225027.exv Exif.CanonSi.0x0003 Short 1 320 +> 20060127_225027.exv Exif.CanonSi.MeasuredEV Short 1 15.00 > 20060127_225027.exv Exif.CanonSi.TargetAperture Short 1 F4 > 20060127_225027.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/1002 s > 20060127_225027.exv Exif.CanonSi.0x0006 Short 1 0 @@ -8450,7 +8450,7 @@ Compare original and inserted image data --------------------------------- > 20060127_225027.exv Exif.CanonSi.0x0014 Short 1 0 > 20060127_225027.exv Exif.CanonSi.ApertureValue Short 1 F4 > 20060127_225027.exv Exif.CanonSi.ShutterSpeedValue Short 1 1/1024 s -> 20060127_225027.exv Exif.CanonSi.0x0017 Short 1 0 +> 20060127_225027.exv Exif.CanonSi.MeasuredEV2 Short 1 -6.00 > 20060127_225027.exv Exif.CanonSi.0x0018 Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0019 Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x001a Short 1 250 diff --git a/test/data/write2-test.out b/test/data/write2-test.out index 716f359f..8585929d 100644 --- a/test/data/write2-test.out +++ b/test/data/write2-test.out @@ -23,7 +23,7 @@ Exif.CanonCs.Selftimer 0x0002 Makernote Short 1 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 12 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 0 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 0 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 0 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42 Exif.CanonCf.0x0000 0x0000 Makernote Short 1 4 @@ -47,7 +47,7 @@ Exif.CanonCs.Selftimer 0x0002 Makernote Short 1 Exif.CanonSi.0x0000 0x0000 Makernote Short 1 12 Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0 Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1 0 -Exif.CanonSi.0x0003 0x0003 Makernote Short 1 0 +Exif.CanonSi.MeasuredEV 0x0003 Makernote Short 1 0 Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 99 Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42 Exif.CanonCf.0x0000 0x0000 Makernote Short 1 4