[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:36 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=29dcba6
The following commit has been merged in the master branch:
commit 29dcba6150e4d088d2bd1d2bb8a3269c9550310d
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue May 11 14:14:52 2010 +0000
Added Nikon lens data pretty-print functions (Patch by Jens Mueller)
---
src/nikonmn.cpp | 106 +++++++++++++++++++++++++++++++++++++----------
src/nikonmn.hpp | 8 ++++
test/data/exiv2-test.out | 90 ++++++++++++++++++++--------------------
3 files changed, 136 insertions(+), 68 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 834fa39..47cf403 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1060,11 +1060,11 @@ namespace Exiv2 {
const TagInfo Nikon3MakerNote::tagInfoLd1_[] = {
TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd1IfdId, makerTags, undefined, printExifVersion),
TagInfo( 6, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd1IfdId, makerTags, unsignedByte, printLensId1),
- TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
- TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
- TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
- TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
- TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
+ TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1IfdId, makerTags, unsignedByte, printFStops),
+ TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1IfdId, makerTags, unsignedByte, printAperture),
+ TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1IfdId, makerTags, unsignedByte, printAperture),
TagInfo(12, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
// End of list marker
TagInfo(0xffff, "(UnknownNikonLd1Tag)", "(UnknownNikonLd1Tag)", N_("Unknown Nikon Lens Data 1 Tag"), nikonLd1IfdId, makerTags, invalidTypeId, printValue)
@@ -1078,19 +1078,19 @@ namespace Exiv2 {
// Nikon3 Lens Data 2 Tag Info
const TagInfo Nikon3MakerNote::tagInfoLd2_[] = {
TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd2IfdId, makerTags, undefined, printExifVersion),
- TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
+ TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2IfdId, makerTags, unsignedByte, printExitPupilPosition),
+ TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2IfdId, makerTags, unsignedByte, printAperture),
TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
TagInfo( 9, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd2IfdId, makerTags, unsignedByte, printFocusDistance),
- TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal),
TagInfo(11, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd2IfdId, makerTags, unsignedByte, printLensId2),
- TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2IfdId, makerTags, unsignedByte, printFStops),
+ TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2IfdId, makerTags, unsignedByte, printAperture),
+ TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2IfdId, makerTags, unsignedByte, printAperture),
TagInfo(17, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
- TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2IfdId, makerTags, unsignedByte, printAperture),
// End of list marker
TagInfo(0xffff, "(UnknownNikonLd2Tag)", "(UnknownNikonLd2Tag)", N_("Unknown Nikon Lens Data 2 Tag"), nikonLd2IfdId, makerTags, invalidTypeId, printValue)
};
@@ -1103,19 +1103,19 @@ namespace Exiv2 {
// Nikon3 Lens Data 3 Tag Info
const TagInfo Nikon3MakerNote::tagInfoLd3_[] = {
TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd3IfdId, makerTags, undefined, printExifVersion),
- TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
+ TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3IfdId, makerTags, unsignedByte, printExitPupilPosition),
+ TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3IfdId, makerTags, unsignedByte, printAperture),
TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
TagInfo(10, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd3IfdId, makerTags, unsignedByte, printFocusDistance),
- TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal),
TagInfo(12, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd3IfdId, makerTags, unsignedByte, printLensId3),
- TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3IfdId, makerTags, unsignedByte, printFStops),
+ TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal),
+ TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printAperture),
+ TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printAperture),
TagInfo(18, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
- TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
+ TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3IfdId, makerTags, unsignedByte, printAperture),
// End of list marker
TagInfo(0xffff, "(UnknownNikonLd3Tag)", "(UnknownNikonLd3Tag)", N_("Unknown Nikon Lens Data 3 Tag"), nikonLd3IfdId, makerTags, invalidTypeId, printValue)
};
@@ -2077,6 +2077,66 @@ fmountlens[] = {
return os;
}
+ std::ostream& Nikon3MakerNote::printAperture(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if (value.count() != 1 || value.typeId() != unsignedByte) {
+ return os << "(" << value << ")";
+ }
+ double aperture = pow(2.0, value.toLong()/24.0);
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(2) << "F" << aperture;
+ os.copyfmt(oss);
+ return os;
+ }
+
+ std::ostream& Nikon3MakerNote::printFocal(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if (value.count() != 1 || value.typeId() != unsignedByte) {
+ return os << "(" << value << ")";
+ }
+ double focal = 5.0 * pow(2.0, value.toLong()/24.0);
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(2) << focal << " mm";
+ os.copyfmt(oss);
+ return os;
+ }
+
+ std::ostream& Nikon3MakerNote::printFStops(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if (value.count() != 1 || value.typeId() != unsignedByte) {
+ return os << "(" << value << ")";
+ }
+ double fstops = value.toLong()/12.0;
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(2) << "F" << fstops;
+ os.copyfmt(oss);
+ return os;
+ }
+
+ std::ostream& Nikon3MakerNote::printExitPupilPosition(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0) {
+ return os << "(" << value << ")";
+ }
+ double epp = 2048.0/value.toLong();
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(2) << epp << " mm";
+ os.copyfmt(oss);
+ return os;
+ }
+
std::ostream& Nikon3MakerNote::print0x009a(std::ostream& os,
const Value& value,
const ExifData*)
diff --git a/src/nikonmn.hpp b/src/nikonmn.hpp
index 21a1134..5073871 100644
--- a/src/nikonmn.hpp
+++ b/src/nikonmn.hpp
@@ -178,6 +178,14 @@ namespace Exiv2 {
static std::ostream& printLensId3(std::ostream& os, const Value& value, const ExifData* metadata);
//! Print focus distance
static std::ostream& printFocusDistance(std::ostream& os, const Value& value, const ExifData*);
+ //! Print lens aperture value
+ static std::ostream& printAperture(std::ostream& os, const Value& value, const ExifData*);
+ //! Print lens focal length
+ static std::ostream& printFocal(std::ostream& os, const Value& value, const ExifData*);
+ //! Print lens f-stops
+ static std::ostream& printFStops(std::ostream& os, const Value& value, const ExifData*);
+ //! Print exit pupil position
+ static std::ostream& printExitPupilPosition(std::ostream& os, const Value& value, const ExifData*);
//! Print sensor pixel size
static std::ostream& print0x009a(std::ostream& os, const Value& value, const ExifData*);
//! Print retouch history
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index e81d3f2..f1f7bc9 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -880,21 +880,21 @@ File 4/15: 20040329_224245.jpg
20040329_224245.jpg Exif.NikonCb3.WB_RGBGLevels Short 4 516 256 419 256
20040329_224245.jpg Exif.NikonCb3.0x000e Short 56 0 264 256 0 0 112 12 24 3 396 65389 7 65496 346 65486 65531 65502 295 65535 65535 65535 32768 0 0 0 0 2560 0 640 0 768 0 640 0 0 4112 255 255 77 150 29 65484 65466 122 127 65430 65515 0 1280 8 27666 57139 1369 319 61680 26
20040329_224245.jpg Exif.NikonLd2.Version Undefined 4 1.01
-20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 23
-20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 52
+20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 89.04 mm
+20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 F4.49
20040329_224245.jpg Exif.NikonLd2.0x0006 Byte 1 7
20040329_224245.jpg Exif.NikonLd2.0x0007 Byte 1 0
20040329_224245.jpg Exif.NikonLd2.FocusPosition Byte 1 161
20040329_224245.jpg Exif.NikonLd2.FocusDistance Byte 1 5.31 m
-20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 80
+20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 50.40 mm
20040329_224245.jpg Exif.NikonLd2.LensIDNumber Byte 1 Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED
-20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 64
-20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 45
-20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 92
-20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 44
-20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 52
+20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 F5.33
+20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 18.34 mm
+20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 71.27 mm
+20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 F3.56
+20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 F4.49
20040329_224245.jpg Exif.NikonLd2.MCUVersion Byte 1 132
-20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 52
+20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 F4.49
20040329_224245.jpg Exif.NikonLd2.0x0013 Byte 1 23
20040329_224245.jpg Exif.NikonLd2.0x0014 Byte 1 100
20040329_224245.jpg Exif.NikonLd2.0x0015 Byte 1 32
@@ -2468,21 +2468,21 @@ Compare image data and extracted data ------------------------------------
< 20040329_224245.jpg Exif.NikonCb3.WB_RGBGLevels Short 4 516 256 419 256
< 20040329_224245.jpg Exif.NikonCb3.0x000e Short 56 0 264 256 0 0 112 12 24 3 396 65389 7 65496 346 65486 65531 65502 295 65535 65535 65535 32768 0 0 0 0 2560 0 640 0 768 0 640 0 0 4112 255 255 77 150 29 65484 65466 122 127 65430 65515 0 1280 8 27666 57139 1369 319 61680 26
< 20040329_224245.jpg Exif.NikonLd2.Version Undefined 4 1.01
-< 20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 23
-< 20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 89.04 mm
+< 20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.0x0006 Byte 1 7
< 20040329_224245.jpg Exif.NikonLd2.0x0007 Byte 1 0
< 20040329_224245.jpg Exif.NikonLd2.FocusPosition Byte 1 161
< 20040329_224245.jpg Exif.NikonLd2.FocusDistance Byte 1 5.31 m
-< 20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 80
+< 20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 50.40 mm
< 20040329_224245.jpg Exif.NikonLd2.LensIDNumber Byte 1 Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED
-< 20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 64
-< 20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 45
-< 20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 92
-< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 44
-< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 F5.33
+< 20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 18.34 mm
+< 20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 71.27 mm
+< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 F3.56
+< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.MCUVersion Byte 1 132
-< 20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.0x0013 Byte 1 23
< 20040329_224245.jpg Exif.NikonLd2.0x0014 Byte 1 100
< 20040329_224245.jpg Exif.NikonLd2.0x0015 Byte 1 32
@@ -3984,21 +3984,21 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.NikonCb3.WB_RGBGLevels Short 4 1026 1 41729 1
> 20040329_224245.exv Exif.NikonCb3.0x000e Short 56 0 2049 1 0 0 28672 3072 6144 768 35841 28159 1792 55551 23041 52991 64511 57087 9985 65535 65535 65535 128 0 0 0 0 10 0 32770 0 3 0 32770 0 0 4112 65280 65280 19712 38400 7424 52479 47871 31232 32512 38655 60415 0 5 2048 4716 13279 22789 16129 61680 6656
> 20040329_224245.exv Exif.NikonLd2.Version Undefined 4 1.01
-> 20040329_224245.exv Exif.NikonLd2.ExitPupilPosition Byte 1 23
-> 20040329_224245.exv Exif.NikonLd2.AFAperture Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.ExitPupilPosition Byte 1 89.04 mm
+> 20040329_224245.exv Exif.NikonLd2.AFAperture Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.0x0006 Byte 1 7
> 20040329_224245.exv Exif.NikonLd2.0x0007 Byte 1 0
> 20040329_224245.exv Exif.NikonLd2.FocusPosition Byte 1 161
> 20040329_224245.exv Exif.NikonLd2.FocusDistance Byte 1 5.31 m
-> 20040329_224245.exv Exif.NikonLd2.FocalLength Byte 1 80
+> 20040329_224245.exv Exif.NikonLd2.FocalLength Byte 1 50.40 mm
> 20040329_224245.exv Exif.NikonLd2.LensIDNumber Byte 1 Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED
-> 20040329_224245.exv Exif.NikonLd2.LensFStops Byte 1 64
-> 20040329_224245.exv Exif.NikonLd2.MinFocalLength Byte 1 45
-> 20040329_224245.exv Exif.NikonLd2.MaxFocalLength Byte 1 92
-> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 44
-> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.LensFStops Byte 1 F5.33
+> 20040329_224245.exv Exif.NikonLd2.MinFocalLength Byte 1 18.34 mm
+> 20040329_224245.exv Exif.NikonLd2.MaxFocalLength Byte 1 71.27 mm
+> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 F3.56
+> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.MCUVersion Byte 1 132
-> 20040329_224245.exv Exif.NikonLd2.EffectiveMaxAperture Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.EffectiveMaxAperture Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.0x0013 Byte 1 23
> 20040329_224245.exv Exif.NikonLd2.0x0014 Byte 1 100
> 20040329_224245.exv Exif.NikonLd2.0x0015 Byte 1 32
@@ -5720,21 +5720,21 @@ Compare original and inserted image data ---------------------------------
< 20040329_224245.jpg Exif.NikonCb3.WB_RGBGLevels Short 4 516 256 419 256
< 20040329_224245.jpg Exif.NikonCb3.0x000e Short 56 0 264 256 0 0 112 12 24 3 396 65389 7 65496 346 65486 65531 65502 295 65535 65535 65535 32768 0 0 0 0 2560 0 640 0 768 0 640 0 0 4112 255 255 77 150 29 65484 65466 122 127 65430 65515 0 1280 8 27666 57139 1369 319 61680 26
< 20040329_224245.jpg Exif.NikonLd2.Version Undefined 4 1.01
-< 20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 23
-< 20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.ExitPupilPosition Byte 1 89.04 mm
+< 20040329_224245.jpg Exif.NikonLd2.AFAperture Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.0x0006 Byte 1 7
< 20040329_224245.jpg Exif.NikonLd2.0x0007 Byte 1 0
< 20040329_224245.jpg Exif.NikonLd2.FocusPosition Byte 1 161
< 20040329_224245.jpg Exif.NikonLd2.FocusDistance Byte 1 5.31 m
-< 20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 80
+< 20040329_224245.jpg Exif.NikonLd2.FocalLength Byte 1 50.40 mm
< 20040329_224245.jpg Exif.NikonLd2.LensIDNumber Byte 1 Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED
-< 20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 64
-< 20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 45
-< 20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 92
-< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 44
-< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.LensFStops Byte 1 F5.33
+< 20040329_224245.jpg Exif.NikonLd2.MinFocalLength Byte 1 18.34 mm
+< 20040329_224245.jpg Exif.NikonLd2.MaxFocalLength Byte 1 71.27 mm
+< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 F3.56
+< 20040329_224245.jpg Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.MCUVersion Byte 1 132
-< 20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 52
+< 20040329_224245.jpg Exif.NikonLd2.EffectiveMaxAperture Byte 1 F4.49
< 20040329_224245.jpg Exif.NikonLd2.0x0013 Byte 1 23
< 20040329_224245.jpg Exif.NikonLd2.0x0014 Byte 1 100
< 20040329_224245.jpg Exif.NikonLd2.0x0015 Byte 1 32
@@ -7236,21 +7236,21 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.NikonCb3.WB_RGBGLevels Short 4 1026 1 41729 1
> 20040329_224245.exv Exif.NikonCb3.0x000e Short 56 0 2049 1 0 0 28672 3072 6144 768 35841 28159 1792 55551 23041 52991 64511 57087 9985 65535 65535 65535 128 0 0 0 0 10 0 32770 0 3 0 32770 0 0 4112 65280 65280 19712 38400 7424 52479 47871 31232 32512 38655 60415 0 5 2048 4716 13279 22789 16129 61680 6656
> 20040329_224245.exv Exif.NikonLd2.Version Undefined 4 1.01
-> 20040329_224245.exv Exif.NikonLd2.ExitPupilPosition Byte 1 23
-> 20040329_224245.exv Exif.NikonLd2.AFAperture Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.ExitPupilPosition Byte 1 89.04 mm
+> 20040329_224245.exv Exif.NikonLd2.AFAperture Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.0x0006 Byte 1 7
> 20040329_224245.exv Exif.NikonLd2.0x0007 Byte 1 0
> 20040329_224245.exv Exif.NikonLd2.FocusPosition Byte 1 161
> 20040329_224245.exv Exif.NikonLd2.FocusDistance Byte 1 5.31 m
-> 20040329_224245.exv Exif.NikonLd2.FocalLength Byte 1 80
+> 20040329_224245.exv Exif.NikonLd2.FocalLength Byte 1 50.40 mm
> 20040329_224245.exv Exif.NikonLd2.LensIDNumber Byte 1 Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED
-> 20040329_224245.exv Exif.NikonLd2.LensFStops Byte 1 64
-> 20040329_224245.exv Exif.NikonLd2.MinFocalLength Byte 1 45
-> 20040329_224245.exv Exif.NikonLd2.MaxFocalLength Byte 1 92
-> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 44
-> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.LensFStops Byte 1 F5.33
+> 20040329_224245.exv Exif.NikonLd2.MinFocalLength Byte 1 18.34 mm
+> 20040329_224245.exv Exif.NikonLd2.MaxFocalLength Byte 1 71.27 mm
+> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMinFocal Byte 1 F3.56
+> 20040329_224245.exv Exif.NikonLd2.MaxApertureAtMaxFocal Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.MCUVersion Byte 1 132
-> 20040329_224245.exv Exif.NikonLd2.EffectiveMaxAperture Byte 1 52
+> 20040329_224245.exv Exif.NikonLd2.EffectiveMaxAperture Byte 1 F4.49
> 20040329_224245.exv Exif.NikonLd2.0x0013 Byte 1 23
> 20040329_224245.exv Exif.NikonLd2.0x0014 Byte 1 100
> 20040329_224245.exv Exif.NikonLd2.0x0015 Byte 1 32
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list