diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp index 647758ea..8798a528 100644 --- a/src/easyaccess.cpp +++ b/src/easyaccess.cpp @@ -231,13 +231,28 @@ ExifData::const_iterator whiteBalance(const ExifData& ed) { } ExifData::const_iterator lensName(const ExifData& ed) { - static const char* keys[] = { - // Try Exif.CanonCs.LensType first. - "Exif.CanonCs.LensType", "Exif.Photo.LensModel", "Exif.Canon.LensModel", "Exif.NikonLd1.LensIDNumber", - "Exif.NikonLd2.LensIDNumber", "Exif.NikonLd3.LensIDNumber", "Exif.NikonLd4.LensID", "Exif.NikonLd4.LensIDNumber", - "Exif.Pentax.LensType", "Exif.PentaxDng.LensType", "Exif.Minolta.LensID", "Exif.SonyMinolta.LensID", - "Exif.Sony1.LensID", "Exif.Sony2.LensID", "Exif.Sony1.LensSpec", "Exif.Sony2.LensSpec", - "Exif.OlympusEq.LensType", "Exif.Panasonic.LensType", "Exif.Samsung2.LensType"}; + static const char* keys[] = {// Try Exif.CanonCs.LensType first. + "Exif.CanonCs.LensType", + "Exif.Photo.LensModel", + "Exif.Canon.LensModel", + "Exif.NikonLd1.LensIDNumber", + "Exif.NikonLd2.LensIDNumber", + "Exif.NikonLd3.LensIDNumber", + "Exif.NikonLd4.LensID", + "Exif.NikonLd4.LensIDNumber", + "Exif.Pentax.LensType", + "Exif.PentaxDng.LensType", + "Exif.Minolta.LensID", + "Exif.SonyMinolta.LensID", + "Exif.Sony1.LensID", + "Exif.Sony2.LensID", + "Exif.Sony1.LensSpec", + "Exif.Sony2.LensSpec", + "Exif.OlympusEq.LensType", + "Exif.Panasonic.LensType", + "Exif.Samsung2.LensType", + "Exif.Photo.LensSpecification", + "Exif.Nikon3.Lens"}; for (auto& key : keys) { auto pos = ed.findKey(ExifKey(key)); diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 621b8c5b..e945b8bd 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -442,7 +442,8 @@ constexpr TagInfo Nikon3MakerNote::tagInfo_[] = { SectionId::makerTags, asciiString, -1, printValue}, {0x0083, "LensType", N_("Lens Type"), N_("Lens type"), IfdId::nikon3Id, SectionId::makerTags, unsignedByte, -1, print0x0083}, - {0x0084, "Lens", N_("Lens"), N_("Lens"), IfdId::nikon3Id, SectionId::makerTags, unsignedRational, -1, print0x0084}, + {0x0084, "Lens", N_("Lens"), N_("Lens"), IfdId::nikon3Id, SectionId::makerTags, unsignedRational, -1, + printLensSpecification}, {0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), IfdId::nikon3Id, SectionId::makerTags, unsignedRational, -1, print0x0085}, {0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), IfdId::nikon3Id, SectionId::makerTags, diff --git a/src/tags_int.cpp b/src/tags_int.cpp index c868203f..c0471683 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -2003,7 +2003,7 @@ constexpr TagInfo exifTagInfo[] = { "in the maximum focal length, which are specification information " "for the lens that was used in photography. When the minimum F " "number is unknown, the notation is 0/0"), - IfdId::exifId, SectionId::otherTags, unsignedRational, 4, printValue}, + IfdId::exifId, SectionId::otherTags, unsignedRational, 4, printLensSpecification}, {0xa433, "LensMake", N_("Lens Make"), N_("This tag records the lens manufactor as an ASCII string."), IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue}, {0xa434, "LensModel", N_("Lens Model"), @@ -2569,6 +2569,78 @@ std::ostream& printExifUnit(std::ostream& os, const Value& value, const ExifData return EXV_PRINT_TAG(exifUnit)(os, value, metadata); } +std::ostream& printLensSpecification(std::ostream& os, const Value& value, const ExifData*) { + std::ios::fmtflags f(os.flags()); + // check type and count of values + if (value.typeId() != unsignedRational || value.count() != 4 || + // divisor may be zero only if dividend is not zero + (value.toRational(0).first != 0 && value.toRational(0).second == 0) || + (value.toRational(1).first != 0 && value.toRational(1).second == 0) || + (value.toRational(2).first != 0 && value.toRational(2).second == 0) || + (value.toRational(3).first != 0 && value.toRational(3).second == 0)) { + os << "(" << value << ")"; + return os; + } + // values numerically are ok, so they can be converted + // here first and second can be zero, so initialise float with 0.0f + float focalLength1 = 0.0f; + if (value.toRational(0).first != 0) + focalLength1 = value.toFloat(0); + float focalLength2 = 0.0f; + if (value.toRational(1).first != 0) + focalLength2 = value.toFloat(1); + float fNumber1 = 0.0f; + if (value.toRational(2).first != 0) + fNumber1 = value.toFloat(2); + float fNumber2 = 0.0f; + if (value.toRational(3).first != 0) + fNumber2 = value.toFloat(3); + + // first value must not be bigger than second + if ((focalLength1 > focalLength2 && focalLength2 > 0.0f) || (fNumber1 > fNumber2 && fNumber2 > 0.0f)) { + os << "(" << value << ")"; + return os; + } + + // no lens specification available + if (focalLength1 == 0.0f && focalLength2 == 0.0f && fNumber1 == 0.0f && fNumber2 == 0.0f) { + os << "n/a"; + return os; + } + + // lens specification available - at least parts + if (focalLength1 == 0.0f) + os << "n/a"; + else + os << std::setprecision(5) << focalLength1; + if (focalLength1 != focalLength2) { + if (focalLength2 == 0.0f) + os << "-n/a "; + else + os << "-" << std::setprecision(5) << focalLength2; + } + os << "mm"; + std::ostringstream oss; + oss.copyfmt(os); + + if (fNumber1 > 0.0f || fNumber2 > 0.0f) { + os << " F"; + if (fNumber1 == 0.0f) + os << " n/a"; + else + os << std::setprecision(2) << fNumber1; + if (fNumber1 != fNumber2) { + if (fNumber2 == 0.0f) + os << "-n/a"; + else + os << "-" << std::setprecision(2) << fNumber2; + } + } + os.copyfmt(oss); + os.flags(f); + return os; +} + std::ostream& print0x0000(std::ostream& os, const Value& value, const ExifData*) { if (value.size() != 4 || value.typeId() != unsignedByte) { return os << value; diff --git a/src/tags_int.hpp b/src/tags_int.hpp index ef21d8c2..b4cf80e5 100644 --- a/src/tags_int.hpp +++ b/src/tags_int.hpp @@ -398,6 +398,8 @@ std::ostream& printDegrees(std::ostream& os, const Value& value, const ExifData* std::ostream& printUcs2(std::ostream& os, const Value& value, const ExifData*); //! Print function for Exif units std::ostream& printExifUnit(std::ostream& os, const Value& value, const ExifData*); +//! Print function for lens specification +std::ostream& printLensSpecification(std::ostream& os, const Value& value, const ExifData*); //! Print GPS version std::ostream& print0x0000(std::ostream& os, const Value& value, const ExifData*); //! Print GPS altitude ref diff --git a/test/data/test_reference_files/2021-02-13-1929.heic.out b/test/data/test_reference_files/2021-02-13-1929.heic.out index 6f4445b0..59547760 100644 --- a/test/data/test_reference_files/2021-02-13-1929.heic.out +++ b/test/data/test_reference_files/2021-02-13-1929.heic.out @@ -41,7 +41,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.FocalLengthIn35mmFilm Short 1 26 26.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard -Exif.Photo.LensSpecification Rational 4 17/4 17/4 9/5 9/5 17/4 17/4 9/5 9/5 +Exif.Photo.LensSpecification Rational 4 17/4 17/4 9/5 9/5 4.25mm F1.8 Exif.Photo.LensMake Ascii 6 Apple Apple Exif.Photo.LensModel Ascii 35 iPhone XR back camera 4.25mm f/1.8 iPhone XR back camera 4.25mm f/1.8 Exif.Photo.CompositeImage Short 1 2 GeneralComposite diff --git a/test/data/test_reference_files/20220610_MG_7237.exv.out b/test/data/test_reference_files/20220610_MG_7237.exv.out index ca5e19a8..5351adff 100644 --- a/test/data/test_reference_files/20220610_MG_7237.exv.out +++ b/test/data/test_reference_files/20220610_MG_7237.exv.out @@ -200,7 +200,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 14 Peter Wemmert Peter Wemmert Exif.Photo.BodySerialNumber Ascii 13 113053000536 113053000536 -Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35-80mm Exif.Photo.LensModel Ascii 21 EF35-80mm f/4-5.6 PZ EF35-80mm f/4-5.6 PZ Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 25802 25802 diff --git a/test/data/test_reference_files/20220610_MG_7238.exv.out b/test/data/test_reference_files/20220610_MG_7238.exv.out index 85a25f39..8dba21d0 100644 --- a/test/data/test_reference_files/20220610_MG_7238.exv.out +++ b/test/data/test_reference_files/20220610_MG_7238.exv.out @@ -200,7 +200,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 14 Peter Wemmert Peter Wemmert Exif.Photo.BodySerialNumber Ascii 13 113053000536 113053000536 -Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35-80mm Exif.Photo.LensModel Ascii 18 EF35-80mm f/4-5.6 EF35-80mm f/4-5.6 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 25798 25798 diff --git a/test/data/test_reference_files/20220610_MG_7239.exv.out b/test/data/test_reference_files/20220610_MG_7239.exv.out index a7c744f7..8d8a23ac 100644 --- a/test/data/test_reference_files/20220610_MG_7239.exv.out +++ b/test/data/test_reference_files/20220610_MG_7239.exv.out @@ -200,7 +200,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 14 Peter Wemmert Peter Wemmert Exif.Photo.BodySerialNumber Ascii 13 113053000536 113053000536 -Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35-80mm Exif.Photo.LensModel Ascii 21 EF35-80mm f/4-5.6 II EF35-80mm f/4-5.6 II Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 25802 25802 diff --git a/test/data/test_reference_files/20220610_MG_7240.exv.out b/test/data/test_reference_files/20220610_MG_7240.exv.out index ac45e03e..004bc139 100644 --- a/test/data/test_reference_files/20220610_MG_7240.exv.out +++ b/test/data/test_reference_files/20220610_MG_7240.exv.out @@ -200,7 +200,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 14 Peter Wemmert Peter Wemmert Exif.Photo.BodySerialNumber Ascii 13 113053000536 113053000536 -Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35-80mm Exif.Photo.LensModel Ascii 22 EF35-80mm f/4-5.6 III EF35-80mm f/4-5.6 III Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 25802 25802 diff --git a/test/data/test_reference_files/20220610_MG_7241.exv.out b/test/data/test_reference_files/20220610_MG_7241.exv.out index 96eff076..ac77dd28 100644 --- a/test/data/test_reference_files/20220610_MG_7241.exv.out +++ b/test/data/test_reference_files/20220610_MG_7241.exv.out @@ -200,7 +200,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 14 Peter Wemmert Peter Wemmert Exif.Photo.BodySerialNumber Ascii 13 113053000536 113053000536 -Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 80/1 0/1 0/1 35-80mm Exif.Photo.LensModel Ascii 22 EF35-80mm f/4-5.6 USM EF35-80mm f/4-5.6 USM Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 25802 25802 diff --git a/test/data/test_reference_files/CH0_0174.exv.out b/test/data/test_reference_files/CH0_0174.exv.out index 4059fa3b..afe284a0 100644 --- a/test/data/test_reference_files/CH0_0174.exv.out +++ b/test/data/test_reference_files/CH0_0174.exv.out @@ -179,7 +179,7 @@ Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown Exif.Photo.BodySerialNumber Ascii 8 6078248 6078248 -Exif.Photo.LensSpecification Rational 4 700/10 2000/10 280/100 280/100 700/10 2000/10 280/100 280/100 +Exif.Photo.LensSpecification Rational 4 700/10 2000/10 280/100 280/100 70-200mm F2.8 Exif.Photo.LensMake Ascii 6 Exif.Photo.LensModel Ascii 65 Exif.Photo.LensSerialNumber Ascii 11 diff --git a/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out b/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out index 45956dd8..9f0d0185 100644 --- a/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out +++ b/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out @@ -197,7 +197,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 27 Leonardo Brondani Schenkel Leonardo Brondani Schenkel -Exif.Photo.LensSpecification Rational 4 18/1 35/1 0/1 0/1 18/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 18/1 35/1 0/1 0/1 18-35mm Exif.Photo.LensModel Ascii 8 18-35mm 18-35mm Exif.Image.GPSTag Long 1 9406 9406 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out b/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out index 6cb1568b..65aef6e5 100644 --- a/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out +++ b/test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out @@ -197,7 +197,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 27 Leonardo Brondani Schenkel Leonardo Brondani Schenkel -Exif.Photo.LensSpecification Rational 4 18/1 35/1 0/1 0/1 18/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 18/1 35/1 0/1 0/1 18-35mm Exif.Photo.LensModel Ascii 30 18-35mm F1.8 DC HSM | Art 013 18-35mm F1.8 DC HSM | Art 013 Exif.Image.GPSTag Long 1 9428 9428 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out b/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out index d2f76ee3..e5f2a37e 100644 --- a/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out b/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out index 7899cb57..f93121a0 100644 --- a/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out b/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out index 695bdce3..5caff458 100644 --- a/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out b/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out index 1607fc25..32b97d09 100644 --- a/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out b/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out index cd834ca3..504847be 100644 --- a/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out b/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out index 339971f9..45bed1f1 100644 --- a/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out b/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out index 0000c14c..7d5e7f78 100644 --- a/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out @@ -95,7 +95,7 @@ Exif.Photo.FocalLengthIn35mmFilm Short 1 75 75.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown -Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 5000/100 5000/100 200/100 200/100 +Exif.Photo.LensSpecification Rational 4 5000/100 5000/100 200/100 200/100 50mm F2 Exif.Photo.LensMake Ascii 9 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 14 XF50mmF2 R WR XF50mmF2 R WR Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/IMG_1361.dng.out b/test/data/test_reference_files/IMG_1361.dng.out index 58420c1e..87e0fdc3 100644 --- a/test/data/test_reference_files/IMG_1361.dng.out +++ b/test/data/test_reference_files/IMG_1361.dng.out @@ -139,7 +139,7 @@ Exif.Photo.SceneType Undefined 1 1 Directly photogra Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.FocalLengthIn35mmFilm Short 1 26 26.0 mm -Exif.Photo.LensSpecification Rational 4 807365/524263 6/1 8/5 12/5 807365/524263 6/1 8/5 12/5 +Exif.Photo.LensSpecification Rational 4 807365/524263 6/1 8/5 12/5 1.54-6mm F1.6-2.4 Exif.Photo.LensMake Ascii 6 Apple Apple Exif.Photo.LensModel Ascii 45 iPhone 12 Pro back triple camera 4.2mm f/1.6 iPhone 12 Pro back triple camera 4.2mm f/1.6 Exif.Image.GPSTag Long 1 4630 4630 diff --git a/test/data/test_reference_files/IMG_3578.heic.out b/test/data/test_reference_files/IMG_3578.heic.out index cefc4f01..9ca055db 100644 --- a/test/data/test_reference_files/IMG_3578.heic.out +++ b/test/data/test_reference_files/IMG_3578.heic.out @@ -40,7 +40,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.FocalLengthIn35mmFilm Short 1 26 26.0 mm Exif.Photo.SceneCaptureType Short 1 0 Standard -Exif.Photo.LensSpecification Rational 4 17/4 17/4 9/5 9/5 17/4 17/4 9/5 9/5 +Exif.Photo.LensSpecification Rational 4 17/4 17/4 9/5 9/5 4.25mm F1.8 Exif.Photo.LensMake Ascii 6 Apple Apple Exif.Photo.LensModel Ascii 35 iPhone XR back camera 4.25mm f/1.8 iPhone XR back camera 4.25mm f/1.8 Exif.Photo.CompositeImage Short 1 2 GeneralComposite diff --git a/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out index 51169230..f3f7460a 100644 --- a/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out @@ -216,7 +216,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 14/1 24/1 0/1 0/1 14/1 24/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 14/1 24/1 0/1 0/1 14-24mm Exif.Photo.LensModel Ascii 30 14-24mm F2.8 DG HSM | Art 018 14-24mm F2.8 DG HSM | Art 018 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 42390 42390 diff --git a/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out index 6306a583..a547fb86 100644 --- a/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -217,7 +217,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 28/1 28/1 0/1 0/1 28/1 28/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 28/1 28/1 0/1 0/1 28mm Exif.Photo.LensModel Ascii 27 28mm F1.4 DG HSM | Art 019 28mm F1.4 DG HSM | Art 019 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 42400 42400 diff --git a/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out index 8a2a8dbd..edc92f74 100644 --- a/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -218,7 +218,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35mm Exif.Photo.LensModel Ascii 27 35mm F1.4 DG HSM | Art 012 35mm F1.4 DG HSM | Art 012 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 43020 43020 diff --git a/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out index 4aa29ad3..ac6f9ba1 100644 --- a/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -216,7 +216,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 40/1 40/1 0/1 0/1 40/1 40/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 40/1 40/1 0/1 0/1 40mm Exif.Photo.LensModel Ascii 27 40mm F1.4 DG HSM | Art 018 40mm F1.4 DG HSM | Art 018 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 42388 42388 diff --git a/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out index e82fb25c..c1868f33 100644 --- a/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -218,7 +218,7 @@ Exif.Photo.ExposureMode Short 1 0 Auto Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 50/1 50/1 0/1 0/1 50/1 50/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 50/1 50/1 0/1 0/1 50mm Exif.Photo.LensModel Ascii 27 50mm F1.4 DG HSM | Art 014 50mm F1.4 DG HSM | Art 014 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 43020 43020 diff --git a/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out b/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out index 963a70e9..df2d2a0a 100644 --- a/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out @@ -216,7 +216,7 @@ Exif.Photo.ExposureMode Short 1 1 Manual Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 -Exif.Photo.LensSpecification Rational 4 60/1 600/1 0/1 0/1 60/1 600/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 60/1 600/1 0/1 0/1 60-600mm Exif.Photo.LensModel Ascii 41 60-600mm F4.5-6.3 DG OS HSM | Sports 018 60-600mm F4.5-6.3 DG OS HSM | Sports 018 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 42402 42402 diff --git a/test/data/test_reference_files/TamronSP15-30mmF2.8DiVCUSDA012.exv.out b/test/data/test_reference_files/TamronSP15-30mmF2.8DiVCUSDA012.exv.out index bdf34d2e..1faf6a97 100644 --- a/test/data/test_reference_files/TamronSP15-30mmF2.8DiVCUSDA012.exv.out +++ b/test/data/test_reference_files/TamronSP15-30mmF2.8DiVCUSDA012.exv.out @@ -196,7 +196,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 253020008411 253020008411 -Exif.Photo.LensSpecification Rational 4 15/1 30/1 0/1 0/1 15/1 30/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 15/1 30/1 0/1 0/1 15-30mm Exif.Photo.LensModel Ascii 39 TAMRON SP 15-30mm F/2.8 Di VC USD A012 TAMRON SP 15-30mm F/2.8 Di VC USD A012 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 8930 8930 diff --git a/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF017.exv.out b/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF017.exv.out index d1749bcc..263865ea 100644 --- a/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF017.exv.out +++ b/test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF017.exv.out @@ -186,7 +186,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 32 Exif.Photo.BodySerialNumber Ascii 13 043022015995 043022015995 -Exif.Photo.LensSpecification Rational 4 90/1 90/1 0/0 0/0 90/1 90/1 0/0 0/0 +Exif.Photo.LensSpecification Rational 4 90/1 90/1 0/0 0/0 90mm Exif.Photo.LensModel Ascii 70 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 Exif.Photo.LensSerialNumber Ascii 12 0000000000 0000000000 Exif.Photo.Gamma Rational 1 22/10 2.2 diff --git a/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out b/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out index bc95eec5..e0834493 100644 --- a/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out +++ b/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out @@ -223,7 +223,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 16 Martin Straeten Martin Straeten Exif.Photo.BodySerialNumber Ascii 13 143055002120 143055002120 -Exif.Photo.LensSpecification Rational 4 200/1 800/1 0/1 0/1 200/1 800/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 200/1 800/1 0/1 0/1 200-800mm Exif.Photo.LensModel Ascii 37 EF100-400mm f/4.5-5.6L IS II USM +2x EF100-400mm f/4.5-5.6L IS II USM +2x Exif.Photo.LensSerialNumber Ascii 11 3490009075 3490009075 Exif.Image.GPSTag Long 1 43202 43202 diff --git a/test/data/test_reference_files/exiv2-SonyDSC-HX60V.exv.out b/test/data/test_reference_files/exiv2-SonyDSC-HX60V.exv.out index c85ceb28..162de150 100644 --- a/test/data/test_reference_files/exiv2-SonyDSC-HX60V.exv.out +++ b/test/data/test_reference_files/exiv2-SonyDSC-HX60V.exv.out @@ -130,5 +130,5 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 430/100 12900/100 35/10 63/10 430/100 12900/100 35/10 63/10 +Exif.Photo.LensSpecification Rational 4 430/100 12900/100 35/10 63/10 4.3-129mm F3.5-6.3 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 diff --git a/test/data/test_reference_files/exiv2-SonyDSC-RX100M5A.exv.out b/test/data/test_reference_files/exiv2-SonyDSC-RX100M5A.exv.out index 2c7ad5f9..cecdb01d 100644 --- a/test/data/test_reference_files/exiv2-SonyDSC-RX100M5A.exv.out +++ b/test/data/test_reference_files/exiv2-SonyDSC-RX100M5A.exv.out @@ -131,7 +131,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 880/100 2570/100 18/10 28/10 880/100 2570/100 18/10 28/10 +Exif.Photo.LensSpecification Rational 4 880/100 2570/100 18/10 28/10 8.8-25.7mm F1.8-2.8 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/exiv2-SonyILCA-68.exv.out b/test/data/test_reference_files/exiv2-SonyILCA-68.exv.out index 4b3e45cc..06d0d771 100644 --- a/test/data/test_reference_files/exiv2-SonyILCA-68.exv.out +++ b/test/data/test_reference_files/exiv2-SonyILCA-68.exv.out @@ -124,7 +124,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 180/10 550/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 18-55mm F3.5-5.6 Exif.Photo.LensModel Ascii 27 DT 18-55mm F3.5-5.6 SAM II DT 18-55mm F3.5-5.6 SAM II Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-SonyILCA-99M2.exv.out b/test/data/test_reference_files/exiv2-SonyILCA-99M2.exv.out index 7e8e9e4a..1cc23349 100644 --- a/test/data/test_reference_files/exiv2-SonyILCA-99M2.exv.out +++ b/test/data/test_reference_files/exiv2-SonyILCA-99M2.exv.out @@ -128,7 +128,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 240/10 700/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8 Exif.Photo.LensModel Ascii 23 24-70mm F2.8 ZA SSM II 24-70mm F2.8 ZA SSM II Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-SonyILCE-7SM3.exv.out b/test/data/test_reference_files/exiv2-SonyILCE-7SM3.exv.out index 3a97639b..d943a7fa 100644 --- a/test/data/test_reference_files/exiv2-SonyILCE-7SM3.exv.out +++ b/test/data/test_reference_files/exiv2-SonyILCE-7SM3.exv.out @@ -137,7 +137,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 240/10 700/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8 Exif.Photo.LensModel Ascii 19 FE 24-70mm F2.8 GM FE 24-70mm F2.8 GM Exif.Photo.CompositeImage Short 1 0 Unknown Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out b/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out index 259bc8e3..235eb45b 100644 --- a/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out +++ b/test/data/test_reference_files/exiv2-SonySLT-A58.exv.out @@ -151,7 +151,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 1 Soft Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 240/10 700/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 240/10 700/10 28/10 28/10 24-70mm F2.8 Exif.Photo.LensModel Ascii 20 24-70mm F2.8 ZA SSM 24-70mm F2.8 ZA SSM Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-bug1024.exv.out b/test/data/test_reference_files/exiv2-bug1024.exv.out index 943a1bc0..48f3090e 100644 --- a/test/data/test_reference_files/exiv2-bug1024.exv.out +++ b/test/data/test_reference_files/exiv2-bug1024.exv.out @@ -196,7 +196,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 093026001758 093026001758 -Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 300/1 1000/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 300-1000mm Exif.Photo.LensModel Ascii 11 300-1000mm 300-1000mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 8934 8934 diff --git a/test/data/test_reference_files/exiv2-bug1122.exv.out b/test/data/test_reference_files/exiv2-bug1122.exv.out index 943a1bc0..48f3090e 100644 --- a/test/data/test_reference_files/exiv2-bug1122.exv.out +++ b/test/data/test_reference_files/exiv2-bug1122.exv.out @@ -196,7 +196,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 093026001758 093026001758 -Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 300/1 1000/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 300-1000mm Exif.Photo.LensModel Ascii 11 300-1000mm 300-1000mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 8934 8934 diff --git a/test/data/test_reference_files/exiv2-bug1145a.exv.out b/test/data/test_reference_files/exiv2-bug1145a.exv.out index d7d4f015..638feb63 100644 --- a/test/data/test_reference_files/exiv2-bug1145a.exv.out +++ b/test/data/test_reference_files/exiv2-bug1145a.exv.out @@ -98,7 +98,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 110/10 180/10 45/10 56/10 110/10 180/10 45/10 56/10 +Exif.Photo.LensSpecification Rational 4 110/10 180/10 45/10 56/10 11-18mm F4.5-5.6 Exif.Photo.LensModel Ascii 20 DT 11-18mm F4.5-5.6 DT 11-18mm F4.5-5.6 Exif.Image.GPSTag Long 1 21018 21018 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/exiv2-bug1145b.exv.out b/test/data/test_reference_files/exiv2-bug1145b.exv.out index 3faf2be4..79ea22e4 100644 --- a/test/data/test_reference_files/exiv2-bug1145b.exv.out +++ b/test/data/test_reference_files/exiv2-bug1145b.exv.out @@ -98,7 +98,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 0/10 0/10 0/10 0/10 +Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 n/a Exif.Photo.LensModel Ascii 5 ---- ---- Exif.Image.GPSTag Long 1 21004 21004 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/exiv2-bug1145c.exv.out b/test/data/test_reference_files/exiv2-bug1145c.exv.out index cfbb7cb1..377de588 100644 --- a/test/data/test_reference_files/exiv2-bug1145c.exv.out +++ b/test/data/test_reference_files/exiv2-bug1145c.exv.out @@ -98,7 +98,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 0/10 0/10 0/10 0/10 +Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 n/a Exif.Photo.LensModel Ascii 5 ---- ---- Exif.Image.GPSTag Long 1 21004 21004 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/exiv2-bug1145d.exv.out b/test/data/test_reference_files/exiv2-bug1145d.exv.out index 18c27fed..b2ff497f 100644 --- a/test/data/test_reference_files/exiv2-bug1145d.exv.out +++ b/test/data/test_reference_files/exiv2-bug1145d.exv.out @@ -98,7 +98,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 700/10 3000/10 40/10 56/10 700/10 3000/10 40/10 56/10 +Exif.Photo.LensSpecification Rational 4 700/10 3000/10 40/10 56/10 70-300mm F4-5.6 Exif.Photo.LensModel Ascii 16 70-300mm F4-5.6 70-300mm F4-5.6 Exif.Image.GPSTag Long 1 21014 21014 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/exiv2-bug1145e.exv.out b/test/data/test_reference_files/exiv2-bug1145e.exv.out index a3252f9a..50ecb8a3 100644 --- a/test/data/test_reference_files/exiv2-bug1145e.exv.out +++ b/test/data/test_reference_files/exiv2-bug1145e.exv.out @@ -98,7 +98,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 1000/10 1000/10 28/10 28/10 1000/10 1000/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 1000/10 1000/10 28/10 28/10 100mm F2.8 Exif.Photo.LensModel Ascii 17 100mm F2.8 Macro 100mm F2.8 Macro Exif.Image.GPSTag Long 1 21016 21016 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/exiv2-bug1153Aa.exv.out b/test/data/test_reference_files/exiv2-bug1153Aa.exv.out index 01bf60dc..b0f03b58 100644 --- a/test/data/test_reference_files/exiv2-bug1153Aa.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Aa.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS E 50mm F1.8 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 124 180 0 0 124 180 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ab.exv.out b/test/data/test_reference_files/exiv2-bug1153Ab.exv.out index 01bf60dc..b0f03b58 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ab.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ab.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS E 50mm F1.8 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 124 180 0 0 124 180 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ac.exv.out b/test/data/test_reference_files/exiv2-bug1153Ac.exv.out index fa8704ba..14483566 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ac.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ac.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 190 188 0 0 190 188 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ad.exv.out b/test/data/test_reference_files/exiv2-bug1153Ad.exv.out index 051c0abe..80e20ada 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ad.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ad.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 158 188 0 0 158 188 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ae.exv.out b/test/data/test_reference_files/exiv2-bug1153Ae.exv.out index f3c3f2b1..7b1a2dd6 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ae.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ae.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 74 184 0 0 74 184 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Af.exv.out b/test/data/test_reference_files/exiv2-bug1153Af.exv.out index 56f772de..1cf3f515 100644 --- a/test/data/test_reference_files/exiv2-bug1153Af.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Af.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 64 184 0 0 64 184 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ag.exv.out b/test/data/test_reference_files/exiv2-bug1153Ag.exv.out index 312bdbe9..8209924e 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ag.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ag.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 26 186 0 0 26 186 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ah.exv.out b/test/data/test_reference_files/exiv2-bug1153Ah.exv.out index d2516326..06cfc04c 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ah.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ah.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 152 185 0 0 152 185 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ai.exv.out b/test/data/test_reference_files/exiv2-bug1153Ai.exv.out index 336532bb..01e0f889 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ai.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ai.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 68 185 0 0 68 185 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Aj.exv.out b/test/data/test_reference_files/exiv2-bug1153Aj.exv.out index 5e1babe9..db43a4a9 100644 --- a/test/data/test_reference_files/exiv2-bug1153Aj.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Aj.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 98 185 0 0 98 185 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1153Ak.exv.out b/test/data/test_reference_files/exiv2-bug1153Ak.exv.out index 4a72084f..6e373952 100644 --- a/test/data/test_reference_files/exiv2-bug1153Ak.exv.out +++ b/test/data/test_reference_files/exiv2-bug1153Ak.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 40 183 0 0 40 183 0 0 diff --git a/test/data/test_reference_files/exiv2-bug1166.exv.out b/test/data/test_reference_files/exiv2-bug1166.exv.out index 4e2f9575..7b78c858 100644 --- a/test/data/test_reference_files/exiv2-bug1166.exv.out +++ b/test/data/test_reference_files/exiv2-bug1166.exv.out @@ -199,7 +199,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 153026000424 153026000424 -Exif.Photo.LensSpecification Rational 4 11/1 20/1 0/1 0/1 11/1 20/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 11/1 20/1 0/1 0/1 11-20mm Exif.Photo.LensModel Ascii 8 11-20mm 11-20mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 9400 9400 diff --git a/test/data/test_reference_files/exiv2-bug1167.exv.out b/test/data/test_reference_files/exiv2-bug1167.exv.out index a9be975f..673251ce 100644 --- a/test/data/test_reference_files/exiv2-bug1167.exv.out +++ b/test/data/test_reference_files/exiv2-bug1167.exv.out @@ -199,7 +199,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 153026000424 153026000424 -Exif.Photo.LensSpecification Rational 4 17/1 70/1 0/1 0/1 17/1 70/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 17/1 70/1 0/1 0/1 17-70mm Exif.Photo.LensModel Ascii 8 17-70mm 17-70mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 9400 9400 diff --git a/test/data/test_reference_files/exiv2-bug1170.exv.out b/test/data/test_reference_files/exiv2-bug1170.exv.out index a5141f7e..1719ea64 100644 --- a/test/data/test_reference_files/exiv2-bug1170.exv.out +++ b/test/data/test_reference_files/exiv2-bug1170.exv.out @@ -196,7 +196,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 053024015642 053024015642 -Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35mm Exif.Photo.LensModel Ascii 5 35mm 35mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.DateTimeOriginal Ascii 20 2016:03:22 12:58:55 2016:03:22 12:58:55 diff --git a/test/data/test_reference_files/exiv2-bug1225.exv.out b/test/data/test_reference_files/exiv2-bug1225.exv.out index 3fd983d7..711e97bb 100644 --- a/test/data/test_reference_files/exiv2-bug1225.exv.out +++ b/test/data/test_reference_files/exiv2-bug1225.exv.out @@ -70,7 +70,7 @@ Exif.NikonIi.ISO2 Byte 1 72 200 Exif.NikonIi.ISOExpansion2 Short 1 0 Off Exif.Nikon3.ShutterMode Short 1 16 Electronic Exif.Nikon3.LensType Byte 1 16 (16) -Exif.Nikon3.Lens Rational 4 110/10 275/10 35/10 56/10 11-27mm F3.5-5.6 +Exif.Nikon3.Lens Rational 4 110/10 275/10 35/10 56/10 11-27.5mm F3.5-5.6 Exif.Nikon3.FlashMode Byte 1 0 Did not fire Exif.Nikon3.ShootingMode Short 1 32 Single-frame, Auto ISO Exif.Nikon3.AutoBracketRelease Short 1 1 Auto release diff --git a/test/data/test_reference_files/exiv2-bug1252a.exv.out b/test/data/test_reference_files/exiv2-bug1252a.exv.out index f7836aac..6a2baf0d 100644 --- a/test/data/test_reference_files/exiv2-bug1252a.exv.out +++ b/test/data/test_reference_files/exiv2-bug1252a.exv.out @@ -213,7 +213,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 148024000654 148024000654 -Exif.Photo.LensSpecification Rational 4 120/1 300/1 0/1 0/1 120/1 300/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 120/1 300/1 0/1 0/1 120-300mm Exif.Photo.LensModel Ascii 10 120-300mm 120-300mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 9302 9302 diff --git a/test/data/test_reference_files/exiv2-bug1252b.exv.out b/test/data/test_reference_files/exiv2-bug1252b.exv.out index 7e29512e..c04af587 100644 --- a/test/data/test_reference_files/exiv2-bug1252b.exv.out +++ b/test/data/test_reference_files/exiv2-bug1252b.exv.out @@ -213,7 +213,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 148024000654 148024000654 -Exif.Photo.LensSpecification Rational 4 150/1 500/1 0/1 0/1 150/1 500/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 150/1 500/1 0/1 0/1 150-500mm Exif.Photo.LensModel Ascii 10 150-500mm 150-500mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 9302 9302 diff --git a/test/data/test_reference_files/exiv2-g20.exv.out b/test/data/test_reference_files/exiv2-g20.exv.out index d1749bcc..263865ea 100644 --- a/test/data/test_reference_files/exiv2-g20.exv.out +++ b/test/data/test_reference_files/exiv2-g20.exv.out @@ -186,7 +186,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 32 Exif.Photo.BodySerialNumber Ascii 13 043022015995 043022015995 -Exif.Photo.LensSpecification Rational 4 90/1 90/1 0/0 0/0 90/1 90/1 0/0 0/0 +Exif.Photo.LensSpecification Rational 4 90/1 90/1 0/0 0/0 90mm Exif.Photo.LensModel Ascii 70 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 Exif.Photo.LensSerialNumber Ascii 12 0000000000 0000000000 Exif.Photo.Gamma Rational 1 22/10 2.2 diff --git a/test/data/test_reference_files/exiv2-pr1009.exv.out b/test/data/test_reference_files/exiv2-pr1009.exv.out index ba20ed82..2a034417 100644 --- a/test/data/test_reference_files/exiv2-pr1009.exv.out +++ b/test/data/test_reference_files/exiv2-pr1009.exv.out @@ -153,7 +153,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-pr1409.exv.out b/test/data/test_reference_files/exiv2-pr1409.exv.out index 20b9e462..4e9c761a 100644 --- a/test/data/test_reference_files/exiv2-pr1409.exv.out +++ b/test/data/test_reference_files/exiv2-pr1409.exv.out @@ -113,7 +113,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown Exif.Photo.BodySerialNumber Ascii 11 8CQ00434 8CQ00434 -Exif.Photo.LensSpecification Rational 4 1800/100 5500/100 280/100 400/100 1800/100 5500/100 280/100 400/100 +Exif.Photo.LensSpecification Rational 4 1800/100 5500/100 280/100 400/100 18-55mm F2.8-4 Exif.Photo.LensMake Ascii 13 FUJIFILM FUJIFILM Exif.Photo.LensModel Ascii 64 XF18-55mmF2.8-4 R LM OIS XF18-55mmF2.8-4 R LM OIS Exif.Photo.LensSerialNumber Ascii 11 8BA23023 8BA23023 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage1.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage1.exv.out index 17992813..4caf9e0e 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage1.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage1.exv.out @@ -112,7 +112,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 180/10 550/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 18-55mm F3.5-5.6 Exif.Photo.LensModel Ascii 23 E 18-55mm F3.5-5.6 OSS E 18-55mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage10.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage10.exv.out index a8781b5a..fd33c957 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage10.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage10.exv.out @@ -131,7 +131,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 880/100 7330/100 28/10 28/10 880/100 7330/100 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 880/100 7330/100 28/10 28/10 8.8-73.3mm F2.8 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage11.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage11.exv.out index c900089e..56a0812d 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage11.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage11.exv.out @@ -131,7 +131,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 152 185 0 0 152 185 0 0 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage12.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage12.exv.out index 5fe341e2..b27e96df 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage12.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage12.exv.out @@ -131,7 +131,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 40 183 0 0 40 183 0 0 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage2.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage2.exv.out index 5edbc324..1ed2be64 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage2.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage2.exv.out @@ -133,7 +133,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 940/100 2570/100 18/10 28/10 940/100 2570/100 18/10 28/10 +Exif.Photo.LensSpecification Rational 4 940/100 2570/100 18/10 28/10 9.4-25.7mm F1.8-2.8 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage3.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage3.exv.out index 070f98fc..17a1aace 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage3.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage3.exv.out @@ -136,7 +136,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 880/100 2570/100 18/10 28/10 880/100 2570/100 18/10 28/10 +Exif.Photo.LensSpecification Rational 4 880/100 2570/100 18/10 28/10 8.8-25.7mm F1.8-2.8 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage4.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage4.exv.out index 2c82afec..14cac2cd 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage4.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage4.exv.out @@ -134,7 +134,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS E 50mm F1.8 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 124 180 0 0 124 180 0 0 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage5.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage5.exv.out index 4f7e9c64..be750989 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage5.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage5.exv.out @@ -124,7 +124,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 28/10 28/10 160/10 500/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 28/10 28/10 16-50mm F2.8 Exif.Photo.LensModel Ascii 20 DT 16-50mm F2.8 SSM DT 16-50mm F2.8 SSM Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage6.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage6.exv.out index 0fe11158..4e3fdbb1 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage6.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage6.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS E 50mm F1.8 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 124 180 0 0 124 180 0 0 diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage7.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage7.exv.out index 6b6b2673..8cdae2e7 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage7.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage7.exv.out @@ -103,7 +103,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 180/10 550/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 180/10 550/10 35/10 56/10 18-55mm F3.5-5.6 Exif.Photo.LensModel Ascii 24 DT 18-55mm F3.5-5.6 SAM DT 18-55mm F3.5-5.6 SAM Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) diff --git a/test/data/test_reference_files/exiv2-pr2323_coverage9.exv.out b/test/data/test_reference_files/exiv2-pr2323_coverage9.exv.out index 29cbe202..23480592 100644 --- a/test/data/test_reference_files/exiv2-pr2323_coverage9.exv.out +++ b/test/data/test_reference_files/exiv2-pr2323_coverage9.exv.out @@ -130,7 +130,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS E PZ 16-50mm F3.5-5.6 OSS Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 9 17 0 0 16 39 0 0 11 15 0 0 16 39 0 0 151 5 0 0 16 39 0 0 176 8 0 0 16 39 0 0 1 28 0 0 16 39 0 0 94 2 0 0 16 39 0 0 139 0 0 0 16 39 0 0 203 3 0 0 16 39 0 0 229 27 0 0 16 39 0 0 Exif.Image.DNGPrivateData Byte 4 152 185 0 0 152 185 0 0 diff --git a/test/data/test_reference_files/exiv2-pr317.exv.out b/test/data/test_reference_files/exiv2-pr317.exv.out index f299b40e..28dbd4fd 100644 --- a/test/data/test_reference_files/exiv2-pr317.exv.out +++ b/test/data/test_reference_files/exiv2-pr317.exv.out @@ -180,7 +180,7 @@ Exif.Photo.DigitalZoomRatio Rational 1 6000/6000 1.0 Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 613050001534 613050001534 -Exif.Photo.LensSpecification Rational 4 15/1 45/1 0/1 0/1 15/1 45/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 15/1 45/1 0/1 0/1 15-45mm Exif.Photo.LensModel Ascii 29 EF-M15-45mm f/3.5-6.3 IS STM EF-M15-45mm f/3.5-6.3 IS STM Exif.Photo.LensSerialNumber Ascii 11 000002544e 000002544e Exif.Image.GPSTag Long 1 15884 15884 diff --git a/test/data/test_reference_files/exiv2-pr906.exv.out b/test/data/test_reference_files/exiv2-pr906.exv.out index 3279d570..de5e2247 100644 --- a/test/data/test_reference_files/exiv2-pr906.exv.out +++ b/test/data/test_reference_files/exiv2-pr906.exv.out @@ -138,7 +138,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 850/10 850/10 14/10 14/10 850/10 850/10 14/10 14/10 +Exif.Photo.LensSpecification Rational 4 850/10 850/10 14/10 14/10 85mm F1.4 Exif.Photo.LensModel Ascii 16 FE 85mm F1.4 GM FE 85mm F1.4 GM Exif.Photo.Gamma Rational 1 22/10 2.2 Exif.Image.PrintImageMatching Undefined 106 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 209 23 0 0 16 39 0 0 5 8 0 0 16 39 0 0 212 5 0 0 16 39 0 0 39 12 0 0 16 39 0 0 113 24 0 0 16 39 0 0 120 2 0 0 16 39 0 0 195 0 0 0 16 39 0 0 97 2 0 0 16 39 0 0 22 29 0 0 16 39 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 3 0 2 0 1 0 0 0 3 0 34 0 0 0 1 1 0 0 0 0 209 23 0 0 16 39 0 0 5 8 0 0 16 39 0 0 212 5 0 0 16 39 0 0 39 12 0 0 16 39 0 0 113 24 0 0 16 39 0 0 120 2 0 0 16 39 0 0 195 0 0 0 16 39 0 0 97 2 0 0 16 39 0 0 22 29 0 0 16 39 0 0 diff --git a/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out b/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out index 1b6b8ca6..71c7a964 100644 --- a/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out +++ b/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out @@ -197,7 +197,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 12 Danny Heijl Danny Heijl Exif.Photo.BodySerialNumber Ascii 13 693035001174 693035001174 -Exif.Photo.LensSpecification Rational 4 30/1 30/1 0/1 0/1 30/1 30/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 30/1 30/1 0/1 0/1 30mm Exif.Photo.LensModel Ascii 35 30mm F1.4 DC DN | Contemporary 016 30mm F1.4 DC DN | Contemporary 016 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 6426 6426 diff --git a/test/data/test_reference_files/issue_2246_poc1.exv.out b/test/data/test_reference_files/issue_2246_poc1.exv.out index 85d0cf54..f698870f 100644 --- a/test/data/test_reference_files/issue_2246_poc1.exv.out +++ b/test/data/test_reference_files/issue_2246_poc1.exv.out @@ -175,7 +175,7 @@ Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 1 Low Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.BodySerialNumber Ascii 10 BHLB61153 BHLB61153 -Exif.Photo.LensSpecification Rational 4 14/1 42/1 7/2 28/5 14/1 42/1 7/2 28/5 +Exif.Photo.LensSpecification Rational 4 14/1 42/1 7/2 28/5 14-42mm F3.5-5.6 Exif.Photo.LensModel Ascii 30 OLYMPUS M.14-42mm F3.5-5.6 EZ OLYMPUS M.14-42mm F3.5-5.6 EZ Exif.Photo.LensSerialNumber Ascii 10 AC3C74257 AC3C74257 Exif.Image.GPSTag Long 1 13978 13978 diff --git a/test/data/test_reference_files/olympus-m.zuiko-12-45mm-f4-pro.exv.out b/test/data/test_reference_files/olympus-m.zuiko-12-45mm-f4-pro.exv.out index 5a511286..a0bf5bae 100644 --- a/test/data/test_reference_files/olympus-m.zuiko-12-45mm-f4-pro.exv.out +++ b/test/data/test_reference_files/olympus-m.zuiko-12-45mm-f4-pro.exv.out @@ -192,7 +192,7 @@ Exif.Photo.GainControl Short 1 0 None Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 12/1 45/1 40/10 40/10 12/1 45/1 40/10 40/10 +Exif.Photo.LensSpecification Rational 4 12/1 45/1 40/10 40/10 12-45mm F4 Exif.Photo.LensModel Ascii 32 OLYMPUS M.12-45mm F4.0 OLYMPUS M.12-45mm F4.0 Exif.Image.GPSTag Long 1 15782 15782 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/olympus-m.zuiko-17mm-f1.2-pro.exv.out b/test/data/test_reference_files/olympus-m.zuiko-17mm-f1.2-pro.exv.out index 4d8f43f5..016159ae 100644 --- a/test/data/test_reference_files/olympus-m.zuiko-17mm-f1.2-pro.exv.out +++ b/test/data/test_reference_files/olympus-m.zuiko-17mm-f1.2-pro.exv.out @@ -180,7 +180,7 @@ Exif.Photo.GainControl Short 1 0 None Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 17/1 17/1 12/10 12/10 17/1 17/1 12/10 12/10 +Exif.Photo.LensSpecification Rational 4 17/1 17/1 12/10 12/10 17mm F1.2 Exif.Photo.LensModel Ascii 32 OLYMPUS M.17mm F1.2 OLYMPUS M.17mm F1.2 Exif.Image.GPSTag Long 1 16792 16792 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/pr_1384.exv.out b/test/data/test_reference_files/pr_1384.exv.out index 2a32ea8f..506719bd 100644 --- a/test/data/test_reference_files/pr_1384.exv.out +++ b/test/data/test_reference_files/pr_1384.exv.out @@ -55,7 +55,7 @@ Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal Exif.Photo.SubjectDistanceRange Short 1 0 Unknown Exif.Photo.BodySerialNumber Ascii 8 6009148 6009148 -Exif.Photo.LensSpecification Rational 4 500/10 500/10 180/100 180/100 500/10 500/10 180/100 180/100 +Exif.Photo.LensSpecification Rational 4 500/10 500/10 180/100 180/100 50mm F1.8 Exif.Photo.LensMake Ascii 6 NIKON NIKON Exif.Photo.LensModel Ascii 22 NIKKOR Z 50mm f/1.8 S NIKKOR Z 50mm f/1.8 S Exif.Photo.LensSerialNumber Ascii 9 20043925 20043925 diff --git a/test/data/test_reference_files/pr_2216.exv.out b/test/data/test_reference_files/pr_2216.exv.out index 68296520..9961f3d8 100644 --- a/test/data/test_reference_files/pr_2216.exv.out +++ b/test/data/test_reference_files/pr_2216.exv.out @@ -230,7 +230,7 @@ Exif.Photo.WhiteBalance Short 1 0 Auto Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 403022001947 403022001947 -Exif.Photo.LensSpecification Rational 4 24/1 105/1 0/1 0/1 24/1 105/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 24/1 105/1 0/1 0/1 24-105mm Exif.Photo.LensModel Ascii 25 RF24-105mm F4-7.1 IS STM RF24-105mm F4-7.1 IS STM Exif.Photo.LensSerialNumber Ascii 11 000002a620 000002a620 Exif.Image.GPSTag Long 1 10982 10982 diff --git a/test/data/test_reference_files/test_issue_1464.exv.out b/test/data/test_reference_files/test_issue_1464.exv.out index 9d1a3f06..e70e8bed 100644 --- a/test/data/test_reference_files/test_issue_1464.exv.out +++ b/test/data/test_reference_files/test_issue_1464.exv.out @@ -147,7 +147,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 1040/100 3710/100 18/10 49/10 +Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 10.4-37.1mm F1.8-4.9 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/test_issue_1471.exv.out b/test/data/test_reference_files/test_issue_1471.exv.out index 9d1a3f06..e70e8bed 100644 --- a/test/data/test_reference_files/test_issue_1471.exv.out +++ b/test/data/test_reference_files/test_issue_1471.exv.out @@ -147,7 +147,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 1040/100 3710/100 18/10 49/10 +Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 10.4-37.1mm F1.8-4.9 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/test_issue_1472.jpg.out b/test/data/test_reference_files/test_issue_1472.jpg.out index 9d1a3f06..e70e8bed 100644 --- a/test/data/test_reference_files/test_issue_1472.jpg.out +++ b/test/data/test_reference_files/test_issue_1472.jpg.out @@ -147,7 +147,7 @@ Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 1040/100 3710/100 18/10 49/10 +Exif.Photo.LensSpecification Rational 4 1040/100 3710/100 18/10 49/10 10.4-37.1mm F1.8-4.9 Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 80 114 105 110 116 73 77 0 48 51 48 48 0 0 2 0 2 0 1 0 0 0 1 1 1 0 0 0 Exif.Thumbnail.Compression Short 1 6 JPEG (old-style) Exif.Thumbnail.ImageDescription Ascii 32 diff --git a/test/data/test_reference_files/test_issue_2126.exv.out b/test/data/test_reference_files/test_issue_2126.exv.out index 630737f5..0d7967bc 100644 --- a/test/data/test_reference_files/test_issue_2126.exv.out +++ b/test/data/test_reference_files/test_issue_2126.exv.out @@ -191,7 +191,7 @@ Exif.Photo.GainControl Short 1 0 None Exif.Photo.Contrast Short 1 0 Normal Exif.Photo.Saturation Short 1 0 Normal Exif.Photo.Sharpness Short 1 0 Normal -Exif.Photo.LensSpecification Rational 4 12/1 100/1 40/10 40/10 12/1 100/1 40/10 40/10 +Exif.Photo.LensSpecification Rational 4 12/1 100/1 40/10 40/10 12-100mm F4 Exif.Photo.LensModel Ascii 32 OLYMPUS M.12-100mm F4.0 OLYMPUS M.12-100mm F4.0 Exif.Image.GPSTag Long 1 19878 19878 Exif.GPSInfo.GPSVersionID Byte 4 2 3 0 0 2.3.0.0 diff --git a/test/data/test_reference_files/test_issue_981b.exv.out b/test/data/test_reference_files/test_issue_981b.exv.out index 213c60aa..abe96ca3 100644 --- a/test/data/test_reference_files/test_issue_981b.exv.out +++ b/test/data/test_reference_files/test_issue_981b.exv.out @@ -219,7 +219,7 @@ Exif.Photo.WhiteBalance Short 1 1 Manual Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 263057004424 263057004424 -Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35mm Exif.Photo.LensModel Ascii 27 35mm F1.4 DG HSM | Art 012 35mm F1.4 DG HSM | Art 012 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 10476 10476 diff --git a/test/data/test_reference_files/test_issue_981c.exv.out b/test/data/test_reference_files/test_issue_981c.exv.out index 8ef0af45..3c804f4a 100644 --- a/test/data/test_reference_files/test_issue_981c.exv.out +++ b/test/data/test_reference_files/test_issue_981c.exv.out @@ -223,7 +223,7 @@ Exif.Photo.WhiteBalance Short 1 1 Manual Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 263057004424 263057004424 -Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 35mm Exif.Photo.LensModel Ascii 27 35mm F1.4 DG HSM | Art 012 35mm F1.4 DG HSM | Art 012 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 43156 43156 diff --git a/test/data/test_reference_files/test_issue_981d.exv.out b/test/data/test_reference_files/test_issue_981d.exv.out index ea131cac..fdc56409 100644 --- a/test/data/test_reference_files/test_issue_981d.exv.out +++ b/test/data/test_reference_files/test_issue_981d.exv.out @@ -223,7 +223,7 @@ Exif.Photo.WhiteBalance Short 1 1 Manual Exif.Photo.SceneCaptureType Short 1 0 Standard Exif.Photo.CameraOwnerName Ascii 1 Exif.Photo.BodySerialNumber Ascii 13 263057004424 263057004424 -Exif.Photo.LensSpecification Rational 4 28/1 80/1 0/1 0/1 28/1 80/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 28/1 80/1 0/1 0/1 28-80mm Exif.Photo.LensModel Ascii 20 EF28-80mm f/3.5-5.6 EF28-80mm f/3.5-5.6 Exif.Photo.LensSerialNumber Ascii 11 0000000000 0000000000 Exif.Image.GPSTag Long 1 43148 43148 diff --git a/tests/bash_tests/test_Photo_LensSpecification.py b/tests/bash_tests/test_Photo_LensSpecification.py new file mode 100644 index 00000000..a1ce831e --- /dev/null +++ b/tests/bash_tests/test_Photo_LensSpecification.py @@ -0,0 +1,284 @@ +# -*- coding: utf-8 -*- + +from system_tests import CaseMeta, CopyTmpFiles, path + +##################################################################### +# Standard cases (correct values) +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationCorrect(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 1000/10 1000/10 28/10 28/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 280/10 700/10 28/10 28/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 280/10 700/10 28/10 40/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 28/10 70/10 28/10 40/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "1000/10 1000/10 28/10 28/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 100mm F2.8 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "280/10 700/10 28/10 28/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 28-70mm F2.8 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "280/10 700/10 28/10 40/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 28-70mm F2.8-4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "28/10 70/10 28/10 40/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 2.8-7mm F2.8-4 +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# empty lens specification (all zeros) +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationEmpty(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 0/0 0/0 0/0 0/0" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "0/0 0/0 0/0 0/0" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 n/a +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# Exif.Photo.LensSpecification filled with wrong type: Ascii +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationAscii(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification Ascii 1/10 2/10 3/10 4/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "1/10 2/10 3/10 4/10" (Ascii) +""", + """Exif.Photo.LensSpecification Ascii 20 (1/10 2/10 3/10 4/10) +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# Exif.Photo.LensSpecification filled with wrong type: Byte (4 values) +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecification4Byte(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification Byte 1 2 3 4" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "1 2 3 4" (Byte) +""", + """Exif.Photo.LensSpecification Byte 4 (1 2 3 4) +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# Exif.Photo.LensSpecification filled with wrong number of values +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecification5Rational(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 1/10 2/10 3/10 4/10 5/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "1/10 2/10 3/10 4/10 5/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 5 (1/10 2/10 3/10 4/10 5/10) +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# divisor is zero +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationZeroDevisor(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 1/0 2/10 3/10 4/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 1/10 2/0 3/10 4/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 1/10 2/10 3/0 4/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 1/10 2/10 3/10 4/0" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "1/0 2/10 3/10 4/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (1/0 2/10 3/10 4/10) +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "1/10 2/0 3/10 4/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (1/10 2/0 3/10 4/10) +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "1/10 2/10 3/0 4/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (1/10 2/10 3/0 4/10) +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "1/10 2/10 3/10 4/0" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (1/10 2/10 3/10 4/0) +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# dividend is zero +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationZeroDevidend(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 0/10 200/10 33/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 0/10 33/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 200/10 0/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 200/10 33/10 0/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "0/10 200/10 33/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 n/a-20mm F3.3-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 0/10 33/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-n/a mm F3.3-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 200/10 0/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-20mm F n/a-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 200/10 33/10 0/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-20mm F3.3-n/a +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# dividend and divisor is zero +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationZeroDevidendDivisior(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 0/0 200/10 33/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 0/0 33/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 200/10 0/0 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 200/10 33/10 0/0" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "0/0 200/10 33/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 n/a-20mm F3.3-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 0/0 33/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-n/a mm F3.3-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 200/10 0/0 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-20mm F n/a-4.4 +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 200/10 33/10 0/0" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 10-20mm F3.3-n/a +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + +##################################################################### +# first value bigger than second +##################################################################### +@CopyTmpFiles("$data_path/exiv2-empty.jpg") +class LensSpecificationFirstBiggerSecond(metaclass=CaseMeta): + + filename = path("$tmp_path/exiv2-empty.jpg") + + commands = [ + """$exiv2 -u -v -M"add Exif.Photo.LensSpecification 2010/100 200/10 33/10 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename", + """$exiv2 -u -v -M"set Exif.Photo.LensSpecification 100/10 200/10 441/100 44/10" $filename""", + "$exiv2 -KExif.Photo.LensSpecification $filename" + ] + stdout = ["""File 1/1: $filename +Add Exif.Photo.LensSpecification "2010/100 200/10 33/10 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (2010/100 200/10 33/10 44/10) +""", + """File 1/1: $filename +Set Exif.Photo.LensSpecification "100/10 200/10 441/100 44/10" (Rational) +""", + """Exif.Photo.LensSpecification Rational 4 (100/10 200/10 441/100 44/10) +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + diff --git a/tests/bash_tests/test_easyaccess.py b/tests/bash_tests/test_easyaccess.py index 93c8aec9..3637155c 100644 --- a/tests/bash_tests/test_easyaccess.py +++ b/tests/bash_tests/test_easyaccess.py @@ -183,6 +183,64 @@ Del Exif.Photo.ISOSpeedRatings stderr = [""] * len(commands) retval = [0] * len(commands) +########################################################### +# FUJIFILM X-T3 +########################################################### +@CopyTmpFiles("$data_path/FujiTagsDRangeAutoRating1.jpg") +class Canon2(metaclass=CaseMeta): + + filename = path("$tmp_path/FujiTagsDRangeAutoRating1.jpg") + + commands = [ + "$easyaccess_test $filename", + """$exiv2 -u -v -M"del Exif.Photo.LensModel" $filename""", + "$easyaccess_test $filename LensName" + ] + stdout = [ + """Orientation (Exif.Image.Orientation ) : top, left +ISO speed (Exif.Photo.ISOSpeedRatings ) : 800 +Date & time original ( ) : +Flash bias ( ) : +Exposure mode (Exif.Photo.ExposureProgram ) : Manual +Scene mode (Exif.Fujifilm.PictureMode ) : Manual +Macro mode ( ) : +Image quality (Exif.Fujifilm.Quality ) : NORMAL +White balance (Exif.Fujifilm.WhiteBalance ) : Auto +Lens name (Exif.Photo.LensModel ) : XF50mmF2 R WR +Saturation (Exif.Fujifilm.Color ) : 0 (normal) +Sharpness (Exif.Photo.Sharpness ) : Normal +Contrast ( ) : +Scene capture type (Exif.Photo.SceneCaptureType ) : Standard +Metering mode (Exif.Photo.MeteringMode ) : Multi-segment +Camera make (Exif.Image.Make ) : FUJIFILM +Camera model (Exif.Image.Model ) : X-T3 +Exposure time (Exif.Photo.ExposureTime ) : 1/8000 s +FNumber (Exif.Photo.FNumber ) : F2 +Shutter speed value (Exif.Photo.ShutterSpeedValue ) : 1/8192 s +Aperture value (Exif.Photo.ApertureValue ) : F2 +Brightness value (Exif.Photo.BrightnessValue ) : 2.53 +Exposure bias (Exif.Photo.ExposureBiasValue ) : 0 EV +Max aperture value (Exif.Photo.MaxApertureValue ) : F2 +Subject distance ( ) : +Light source (Exif.Photo.LightSource ) : Unknown +Flash (Exif.Photo.Flash ) : No flash +Camera serial number ( ) : +Focal length (Exif.Photo.FocalLength ) : 50.0 mm +Subject location/area ( ) : +Flash energy ( ) : +Exposure index ( ) : +Sensing method (Exif.Photo.SensingMethod ) : One-chip color area +AF point ( ) : +""", + """File 1/1: $filename +Del Exif.Photo.LensModel +""", + """Lens name (Exif.Photo.LensSpecification ) : 50mm F2 +""" + ] + stderr = [""] * len(commands) + retval = [0] * len(commands) + ########################################################### # Nikon D1 ########################################################### diff --git a/tests/bugfixes/github/test_issue_20.py b/tests/bugfixes/github/test_issue_20.py index 43f26493..2d4dfb1b 100644 --- a/tests/bugfixes/github/test_issue_20.py +++ b/tests/bugfixes/github/test_issue_20.py @@ -27,7 +27,7 @@ class TamronSupport(metaclass=system_tests.CaseMeta): Exif.CanonCs.Lens Short 3 90.0 mm Exif.Canon.LensModel Ascii 70 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 Exif.CanonLe.LensSerialNumber SLong 1 0 -Exif.Photo.LensSpecification Rational 4 90/1 90/1 0/0 0/0 +Exif.Photo.LensSpecification Rational 4 90mm Exif.Photo.LensModel Ascii 70 TAMRON SP 90mm F/2.8 Di VC USD MACRO1:1 F017 Exif.Photo.LensSerialNumber Ascii 12 0000000000 """, diff --git a/tests/bugfixes/github/test_pr_1437.py b/tests/bugfixes/github/test_pr_1437.py index 29af8e23..b959bffc 100644 --- a/tests/bugfixes/github/test_pr_1437.py +++ b/tests/bugfixes/github/test_pr_1437.py @@ -22,7 +22,7 @@ Exif.NikonLd4.EffectiveMaxAperture Byte 1 F2.8 Exif.NikonLd4.LensID Short 1 0 Exif.NikonLd4.MaxAperture Short 1 F0.5 Exif.Nikon3.ShutterCount Long 1 174 -Exif.Photo.LensSpecification Rational 4 700/10 2000/10 280/100 280/100 +Exif.Photo.LensSpecification Rational 4 70-200mm F2.8 Exif.Photo.LensMake Ascii 6 Exif.Photo.LensModel Ascii 65 Exif.Photo.LensSerialNumber Ascii 11 diff --git a/tests/bugfixes/redmine/test_issue_1122.py b/tests/bugfixes/redmine/test_issue_1122.py index 73180252..eb329176 100644 --- a/tests/bugfixes/redmine/test_issue_1122.py +++ b/tests/bugfixes/redmine/test_issue_1122.py @@ -23,7 +23,7 @@ class CheckLensDetectionTeleconverter(metaclass=system_tests.CaseMeta): Exif.CanonCs.Lens Short 3 300.0 - 1000.0 mm Exif.Canon.LensModel Ascii 74 300-1000mm Exif.CanonLe.LensSerialNumber SLong 1 0 -Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 300-1000mm Exif.Photo.LensModel Ascii 11 300-1000mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """ diff --git a/tests/bugfixes/redmine/test_issue_1145.py b/tests/bugfixes/redmine/test_issue_1145.py index a7446404..3c1fa0a0 100644 --- a/tests/bugfixes/redmine/test_issue_1145.py +++ b/tests/bugfixes/redmine/test_issue_1145.py @@ -22,27 +22,27 @@ class CheckSonyMinoltaLenses(metaclass=system_tests.CaseMeta): stdout = [ """Exif.Sony1.LensID Long 1 Tamron SP AF 11-18mm F4.5-5.6 Di II LD Aspherical IF Exif.Sony1.LensSpec Byte 8 Unknown -Exif.Photo.LensSpecification Rational 4 110/10 180/10 45/10 56/10 +Exif.Photo.LensSpecification Rational 4 11-18mm F4.5-5.6 Exif.Photo.LensModel Ascii 20 DT 11-18mm F4.5-5.6 """, """Exif.Sony1.LensID Long 1 Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical Exif.Sony1.LensSpec Byte 8 Unknown -Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 +Exif.Photo.LensSpecification Rational 4 n/a Exif.Photo.LensModel Ascii 5 ---- """, """Exif.Sony1.LensID Long 1 Tamron AF 18-200mm F3.5-6.3 XR Di II LD Aspherical [IF] Macro Exif.Sony1.LensSpec Byte 8 Unknown -Exif.Photo.LensSpecification Rational 4 0/10 0/10 0/10 0/10 +Exif.Photo.LensSpecification Rational 4 n/a Exif.Photo.LensModel Ascii 5 ---- """, """Exif.Sony1.LensID Long 1 Tamron SP 70-300mm F4-5.6 Di USD Exif.Sony1.LensSpec Byte 8 70-300mm F4.0-5.6 -Exif.Photo.LensSpecification Rational 4 700/10 3000/10 40/10 56/10 +Exif.Photo.LensSpecification Rational 4 70-300mm F4-5.6 Exif.Photo.LensModel Ascii 16 70-300mm F4-5.6 """, """Exif.Sony1.LensID Long 1 Tamron SP AF 90mm F2.8 Di Macro Exif.Sony1.LensSpec Byte 8 Unknown -Exif.Photo.LensSpecification Rational 4 1000/10 1000/10 28/10 28/10 +Exif.Photo.LensSpecification Rational 4 100mm F2.8 Exif.Photo.LensModel Ascii 17 100mm F2.8 Macro """, ] diff --git a/tests/bugfixes/redmine/test_issue_1153.py b/tests/bugfixes/redmine/test_issue_1153.py index 11f04cbf..18597cfa 100644 --- a/tests/bugfixes/redmine/test_issue_1153.py +++ b/tests/bugfixes/redmine/test_issue_1153.py @@ -21,47 +21,47 @@ class CheckSony6000WithoutLensModels(metaclass=system_tests.CaseMeta): stdout = [ """Exif.Sony2.LensID Long 1 Sony E 50mm F1.8 OSS -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS """, """Exif.Sony2.LensID Long 1 Sony E 50mm F1.8 OSS -Exif.Photo.LensSpecification Rational 4 500/10 500/10 18/10 18/10 +Exif.Photo.LensSpecification Rational 4 50mm F1.8 Exif.Photo.LensModel Ascii 16 E 50mm F1.8 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, """Exif.Sony2.LensID Long 1 E PZ 16-50mm F3.5-5.6 OSS -Exif.Photo.LensSpecification Rational 4 160/10 500/10 35/10 56/10 +Exif.Photo.LensSpecification Rational 4 16-50mm F3.5-5.6 Exif.Photo.LensModel Ascii 26 E PZ 16-50mm F3.5-5.6 OSS """, diff --git a/tests/bugfixes/redmine/test_issue_1166.py b/tests/bugfixes/redmine/test_issue_1166.py index 825e8c95..906643b7 100644 --- a/tests/bugfixes/redmine/test_issue_1166.py +++ b/tests/bugfixes/redmine/test_issue_1166.py @@ -14,7 +14,7 @@ class CheckTokina11_20mm(metaclass=system_tests.CaseMeta): Exif.CanonCs.Lens Short 3 11.0 - 20.0 mm Exif.Canon.LensModel Ascii 74 11-20mm Exif.CanonLe.LensSerialNumber SLong 1 0 -Exif.Photo.LensSpecification Rational 4 11/1 20/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 11-20mm Exif.Photo.LensModel Ascii 8 11-20mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """, diff --git a/tests/bugfixes/redmine/test_issue_1167.py b/tests/bugfixes/redmine/test_issue_1167.py index 0e60a450..2a0e9bd0 100644 --- a/tests/bugfixes/redmine/test_issue_1167.py +++ b/tests/bugfixes/redmine/test_issue_1167.py @@ -14,7 +14,7 @@ class CheckSigma17_70Lens(metaclass=system_tests.CaseMeta): Exif.CanonCs.Lens Short 3 17.0 - 70.0 mm Exif.Canon.LensModel Ascii 74 17-70mm Exif.CanonLe.LensSerialNumber SLong 1 0 -Exif.Photo.LensSpecification Rational 4 17/1 70/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 17-70mm Exif.Photo.LensModel Ascii 8 17-70mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """, diff --git a/tests/bugfixes/redmine/test_issue_1170.py b/tests/bugfixes/redmine/test_issue_1170.py index 1563e907..4741321e 100644 --- a/tests/bugfixes/redmine/test_issue_1170.py +++ b/tests/bugfixes/redmine/test_issue_1170.py @@ -14,7 +14,7 @@ class CheckSigma35mm(metaclass=system_tests.CaseMeta): Exif.CanonCs.Lens Short 3 35.0 mm Exif.Canon.LensModel Ascii 74 35mm Exif.CanonLe.LensSerialNumber SLong 1 0 -Exif.Photo.LensSpecification Rational 4 35/1 35/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 35mm Exif.Photo.LensModel Ascii 5 35mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """, diff --git a/tests/bugfixes/redmine/test_issue_1252.py b/tests/bugfixes/redmine/test_issue_1252.py index 16413699..8f85a111 100644 --- a/tests/bugfixes/redmine/test_issue_1252.py +++ b/tests/bugfixes/redmine/test_issue_1252.py @@ -22,7 +22,7 @@ Exif.Canon.LensModel Ascii 74 120-300mm Exif.CanonLe.LensSerialNumber SLong 1 0 Exif.CanonAfC.USMLensElectronicMF SLong 1 Enable After AF Exif.CanonAfC.LensDriveWhenAFImpossible SLong 1 Continue Focus Search -Exif.Photo.LensSpecification Rational 4 120/1 300/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 120-300mm Exif.Photo.LensModel Ascii 10 120-300mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """, @@ -32,7 +32,7 @@ Exif.Canon.LensModel Ascii 74 150-500mm Exif.CanonLe.LensSerialNumber SLong 1 0 Exif.CanonAfC.USMLensElectronicMF SLong 1 Enable After AF Exif.CanonAfC.LensDriveWhenAFImpossible SLong 1 Continue Focus Search -Exif.Photo.LensSpecification Rational 4 150/1 500/1 0/1 0/1 +Exif.Photo.LensSpecification Rational 4 150-500mm Exif.Photo.LensModel Ascii 10 150-500mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 """