Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Interpretation for Exif.Photo.LensSpecification #2422

Merged
merged 8 commits into from
Mar 7, 2023
Merged

Interpretation for Exif.Photo.LensSpecification #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb47fcf
interpretation for ExifPhoto.LensSpecification
norbertwg Nov 14, 2022
5116598
add two lens tags to EasyAccess API
norbertwg Nov 15, 2022
6066130
handling of zero; more precision for focal length
norbertwg Nov 19, 2022
5d0d08f
silence compiler warnings
norbertwg Nov 19, 2022
5e1a1bc
Merge branch 'Exiv2:main' into interpretation-for-Exif.Photo.LensSpec…
norbertwg Dec 2, 2022
db2f4ee
interpretation for ExifPhoto.LensSpecification
norbertwg Nov 14, 2022
979ce8a
Merge branch 'interpretation-for-Exif.Photo.LensSpecification' of htt…
norbertwg Mar 7, 2023
10bbe3f
to avoid compiler warnings: 0.0 changed to 0.0f
norbertwg Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions src/easyaccess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,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 (size_t i = 0; i < std::size(keys); ++i) {
Exiv2::ExifData::const_iterator pos = ed.findKey(ExifKey(keys[i]));
Expand Down
3 changes: 2 additions & 1 deletion src/nikonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,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,
Expand Down
74 changes: 73 additions & 1 deletion src/tags_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/tags_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/2021-02-13-1929.heic.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7237.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7238.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7239.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7240.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7241.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/CH0_0174.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading