[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:40:21 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3b4f5b8
The following commit has been merged in the master branch:
commit 3b4f5b8c353eea547c06802654ee426f2e9d3ca3
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Feb 10 15:38:14 2009 +0000
#494: Added Exif.Canon.FocalLength (Artis Rozentals).
---
src/actions.cpp | 3 +++
src/canonmn.cpp | 32 ++++++++++++++++++++++++++++-
src/canonmn.hpp | 2 ++
test/data/bugfixes-test.out | 2 +-
test/data/exifdata-test.out | 8 ++++----
test/data/exiv2-test.out | 50 ++++++++++++++++++++++-----------------------
6 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/src/actions.cpp b/src/actions.cpp
index c447e45..b8b5cba 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -348,6 +348,9 @@ namespace Action {
<< md->print(&exifData) << ")";
}
}
+ else {
+ printTag(exifData, "Exif.Canon.FocalLength");
+ }
std::cout << std::endl;
// Subject distance
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 880dd26..b1dc7cf 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -165,7 +165,7 @@ namespace Exiv2 {
const TagInfo CanonMakerNote::tagInfo_[] = {
TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0002, "0x0002", "0x0002", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonIfdId, makerTags, unsignedShort, printFocalLength),
TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonIfdId, makerTags, unsignedShort, printValue),
@@ -875,6 +875,36 @@ namespace Exiv2 {
return tagInfoPi_;
}
+ std::ostream& CanonMakerNote::printFocalLength(std::ostream& os,
+ const Value& value,
+ const ExifData* metadata)
+ {
+ if ( !metadata
+ || value.count() < 4
+ || value.typeId() != unsignedShort) {
+ return os << value;
+ }
+
+ ExifKey key("Exif.CanonCs.Lens");
+ ExifData::const_iterator pos = metadata->findKey(key);
+ if ( pos != metadata->end()
+ && pos->value().count() >= 3
+ && pos->value().typeId() == unsignedShort) {
+ float fu = pos->value().toFloat(2);
+ if (fu != 0.0) {
+ float fl = value.toFloat(1) / fu;
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(1);
+ os << fl << " mm";
+ os.copyfmt(oss);
+ return os;
+ }
+ }
+
+ return os << value;
+ }
+
std::ostream& CanonMakerNote::print0x0008(std::ostream& os,
const Value& value,
const ExifData*)
diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index f2db15c..9b67182 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -72,6 +72,8 @@ namespace Exiv2 {
//! @name Print functions for Canon %MakerNote tags
//@{
+ //! Print the focal length
+ static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
//! Print the image number
static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
//! Print the serial number of the camera
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index da4a743..e15c4a2 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -143,7 +143,7 @@ Exif.CanonCs.ZoomSourceWidth Short 1 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272
Exif.CanonCs.0x0026 Short 1 0
Exif.CanonCs.0x0027 Short 1 1
-Exif.Canon.0x0002 Short 4 2 682 286 215
+Exif.Canon.FocalLength Short 4 21.3 mm
Exif.Canon.0x0003 Short 4 0 0 0 0
Exif.CanonSi.0x0000 Short 1 54
Exif.CanonSi.0x0001 Short 1 0
diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out
index ca61440..d5ff956 100644
--- a/test/data/exifdata-test.out
+++ b/test/data/exifdata-test.out
@@ -230,7 +230,7 @@ Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
-Exif.Canon.0x0002 0x0002 Makernote Short 4 2 682 286 215
+Exif.Canon.FocalLength 0x0002 Makernote Short 4 2 682 286 215
Exif.Canon.0x0003 0x0003 Makernote Short 4 0 0 0 0
Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -359,7 +359,7 @@ Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
-Exif.Canon.0x0002 0x0002 Makernote Short 4 2 682 286 215
+Exif.Canon.FocalLength 0x0002 Makernote Short 4 2 682 286 215
Exif.Canon.0x0003 0x0003 Makernote Short 4 0 0 0 0
Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -489,7 +489,7 @@ Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
-Exif.Canon.0x0002 0x0002 Makernote Short 4 2 682 286 215
+Exif.Canon.FocalLength 0x0002 Makernote Short 4 2 682 286 215
Exif.Canon.0x0003 0x0003 Makernote Short 4 0 0 0 0
Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -619,7 +619,7 @@ Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
-Exif.Canon.0x0002 0x0002 Makernote Short 4 2 682 286 215
+Exif.Canon.FocalLength 0x0002 Makernote Short 4 2 682 286 215
Exif.Canon.0x0003 0x0003 Makernote Short 4 0 0 0 0
Exif.CanonSi.0x0000 0x0000 Makernote Short 1 54
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 3898fcf..fd9eb51 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -663,7 +663,7 @@ File 2/15: 20031214_000043.jpg
20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
-20031214_000043.jpg Exif.Canon.0x0002 Short 4 2 682 286 215
+20031214_000043.jpg Exif.Canon.FocalLength Short 4 21.3 mm
20031214_000043.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54
20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -1031,7 +1031,7 @@ File 6/15: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
-20030925_201850.jpg Exif.Canon.0x0002 Short 4 0 18 914 610
+20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm
20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66
20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -1617,7 +1617,7 @@ Error: Directory Canon: Next pointer is out of bounds; ignored.
20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
-20060802_095200.jpg Exif.Canon.0x0002 Short 4 2 95 907 605
+20060802_095200.jpg Exif.Canon.FocalLength Short 4 95.0 mm
20060802_095200.jpg Exif.Canon.0x0003 Short 4 0 100 0 0
20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68
20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -1798,7 +1798,7 @@ File 14/15: 20001004_015404.jpg
20001004_015404.jpg Exif.CanonCs.FlashDetails Short 1
20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0
20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0
-20001004_015404.jpg Exif.Canon.0x0002 Short 4 0 70 914 610
+20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm
20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50
20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -1941,7 +1941,7 @@ File 15/15: 20060127_225027.jpg
20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
-20060127_225027.jpg Exif.Canon.0x0002 Short 4 2 186 229 172
+20060127_225027.jpg Exif.Canon.FocalLength Short 4 5.8 mm
20060127_225027.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68
20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -2186,7 +2186,7 @@ Compare image data and extracted data ------------------------------------
< 20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
-< 20031214_000043.jpg Exif.Canon.0x0002 Short 4 2 682 286 215
+< 20031214_000043.jpg Exif.Canon.FocalLength Short 4 21.3 mm
< 20031214_000043.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
< 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54
< 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -2554,7 +2554,7 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
< 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
-< 20030925_201850.jpg Exif.Canon.0x0002 Short 4 0 18 914 610
+< 20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm
< 20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
< 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66
< 20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -3139,7 +3139,7 @@ Compare image data and extracted data ------------------------------------
< 20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
-< 20060802_095200.jpg Exif.Canon.0x0002 Short 4 2 95 907 605
+< 20060802_095200.jpg Exif.Canon.FocalLength Short 4 95.0 mm
< 20060802_095200.jpg Exif.Canon.0x0003 Short 4 0 100 0 0
< 20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68
< 20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -3320,7 +3320,7 @@ Compare image data and extracted data ------------------------------------
< 20001004_015404.jpg Exif.CanonCs.FlashDetails Short 1
< 20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0
< 20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0
-< 20001004_015404.jpg Exif.Canon.0x0002 Short 4 0 70 914 610
+< 20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm
< 20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
< 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50
< 20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -3463,7 +3463,7 @@ Compare image data and extracted data ------------------------------------
< 20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
-< 20060127_225027.jpg Exif.Canon.0x0002 Short 4 2 186 229 172
+< 20060127_225027.jpg Exif.Canon.FocalLength Short 4 5.8 mm
< 20060127_225027.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
< 20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68
< 20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -3637,7 +3637,7 @@ Compare image data and extracted data ------------------------------------
> 20031214_000043.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0026 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0027 Short 1 1
-> 20031214_000043.exv Exif.Canon.0x0002 Short 4 2 682 286 215
+> 20031214_000043.exv Exif.Canon.FocalLength Short 4 21.3 mm
> 20031214_000043.exv Exif.Canon.0x0003 Short 4 0 0 0 0
> 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54
> 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0
@@ -4005,7 +4005,7 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonCs.0x002b Short 1 32767
> 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535
-> 20030925_201850.exv Exif.Canon.0x0002 Short 4 0 18 914 610
+> 20030925_201850.exv Exif.Canon.FocalLength Short 4 18.0 mm
> 20030925_201850.exv Exif.Canon.0x0003 Short 4 100 0 0 0
> 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66
> 20030925_201850.exv Exif.CanonSi.0x0001 Short 1 0
@@ -4590,7 +4590,7 @@ Compare image data and extracted data ------------------------------------
> 20060802_095200.exv Exif.CanonCs.0x002b Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002c Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x002d Short 1 65535
-> 20060802_095200.exv Exif.Canon.0x0002 Short 4 2 95 907 605
+> 20060802_095200.exv Exif.Canon.FocalLength Short 4 95.0 mm
> 20060802_095200.exv Exif.Canon.0x0003 Short 4 0 100 0 0
> 20060802_095200.exv Exif.CanonSi.0x0000 Short 1 68
> 20060802_095200.exv Exif.CanonSi.0x0001 Short 1 0
@@ -4771,7 +4771,7 @@ Compare image data and extracted data ------------------------------------
> 20001004_015404.exv Exif.CanonCs.FlashDetails Short 1
> 20001004_015404.exv Exif.CanonCs.0x001e Short 1 0
> 20001004_015404.exv Exif.CanonCs.0x001f Short 1 0
-> 20001004_015404.exv Exif.Canon.0x0002 Short 4 0 70 914 610
+> 20001004_015404.exv Exif.Canon.FocalLength Short 4 70.0 mm
> 20001004_015404.exv Exif.Canon.0x0003 Short 4 100 0 0 0
> 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50
> 20001004_015404.exv Exif.CanonSi.0x0001 Short 1 0
@@ -4914,7 +4914,7 @@ Compare image data and extracted data ------------------------------------
> 20060127_225027.exv Exif.CanonCs.0x002b Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002c Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002d Short 1 0
-> 20060127_225027.exv Exif.Canon.0x0002 Short 4 2 186 229 172
+> 20060127_225027.exv Exif.Canon.FocalLength Short 4 5.8 mm
> 20060127_225027.exv Exif.Canon.0x0003 Short 4 0 0 0 0
> 20060127_225027.exv Exif.CanonSi.0x0000 Short 1 68
> 20060127_225027.exv Exif.CanonSi.0x0001 Short 1 0
@@ -5308,7 +5308,7 @@ Compare original and inserted image data ---------------------------------
< 20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
-< 20031214_000043.jpg Exif.Canon.0x0002 Short 4 2 682 286 215
+< 20031214_000043.jpg Exif.Canon.FocalLength Short 4 21.3 mm
< 20031214_000043.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
< 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54
< 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -5676,7 +5676,7 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
< 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
-< 20030925_201850.jpg Exif.Canon.0x0002 Short 4 0 18 914 610
+< 20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm
< 20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
< 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66
< 20030925_201850.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -6261,7 +6261,7 @@ Compare original and inserted image data ---------------------------------
< 20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
-< 20060802_095200.jpg Exif.Canon.0x0002 Short 4 2 95 907 605
+< 20060802_095200.jpg Exif.Canon.FocalLength Short 4 95.0 mm
< 20060802_095200.jpg Exif.Canon.0x0003 Short 4 0 100 0 0
< 20060802_095200.jpg Exif.CanonSi.0x0000 Short 1 68
< 20060802_095200.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -6442,7 +6442,7 @@ Compare original and inserted image data ---------------------------------
< 20001004_015404.jpg Exif.CanonCs.FlashDetails Short 1
< 20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0
< 20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0
-< 20001004_015404.jpg Exif.Canon.0x0002 Short 4 0 70 914 610
+< 20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm
< 20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0
< 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50
< 20001004_015404.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -6585,7 +6585,7 @@ Compare original and inserted image data ---------------------------------
< 20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
-< 20060127_225027.jpg Exif.Canon.0x0002 Short 4 2 186 229 172
+< 20060127_225027.jpg Exif.Canon.FocalLength Short 4 5.8 mm
< 20060127_225027.jpg Exif.Canon.0x0003 Short 4 0 0 0 0
< 20060127_225027.jpg Exif.CanonSi.0x0000 Short 1 68
< 20060127_225027.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -6759,7 +6759,7 @@ Compare original and inserted image data ---------------------------------
> 20031214_000043.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0026 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0027 Short 1 1
-> 20031214_000043.exv Exif.Canon.0x0002 Short 4 2 682 286 215
+> 20031214_000043.exv Exif.Canon.FocalLength Short 4 21.3 mm
> 20031214_000043.exv Exif.Canon.0x0003 Short 4 0 0 0 0
> 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54
> 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0
@@ -7127,7 +7127,7 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonCs.0x002b Short 1 32767
> 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535
-> 20030925_201850.exv Exif.Canon.0x0002 Short 4 0 18 914 610
+> 20030925_201850.exv Exif.Canon.FocalLength Short 4 18.0 mm
> 20030925_201850.exv Exif.Canon.0x0003 Short 4 100 0 0 0
> 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66
> 20030925_201850.exv Exif.CanonSi.0x0001 Short 1 0
@@ -7712,7 +7712,7 @@ Compare original and inserted image data ---------------------------------
> 20060802_095200.exv Exif.CanonCs.0x002b Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002c Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x002d Short 1 65535
-> 20060802_095200.exv Exif.Canon.0x0002 Short 4 2 95 907 605
+> 20060802_095200.exv Exif.Canon.FocalLength Short 4 95.0 mm
> 20060802_095200.exv Exif.Canon.0x0003 Short 4 0 100 0 0
> 20060802_095200.exv Exif.CanonSi.0x0000 Short 1 68
> 20060802_095200.exv Exif.CanonSi.0x0001 Short 1 0
@@ -7893,7 +7893,7 @@ Compare original and inserted image data ---------------------------------
> 20001004_015404.exv Exif.CanonCs.FlashDetails Short 1
> 20001004_015404.exv Exif.CanonCs.0x001e Short 1 0
> 20001004_015404.exv Exif.CanonCs.0x001f Short 1 0
-> 20001004_015404.exv Exif.Canon.0x0002 Short 4 0 70 914 610
+> 20001004_015404.exv Exif.Canon.FocalLength Short 4 70.0 mm
> 20001004_015404.exv Exif.Canon.0x0003 Short 4 100 0 0 0
> 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50
> 20001004_015404.exv Exif.CanonSi.0x0001 Short 1 0
@@ -8036,7 +8036,7 @@ Compare original and inserted image data ---------------------------------
> 20060127_225027.exv Exif.CanonCs.0x002b Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002c Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002d Short 1 0
-> 20060127_225027.exv Exif.Canon.0x0002 Short 4 2 186 229 172
+> 20060127_225027.exv Exif.Canon.FocalLength Short 4 5.8 mm
> 20060127_225027.exv Exif.Canon.0x0003 Short 4 0 0 0 0
> 20060127_225027.exv Exif.CanonSi.0x0000 Short 1 68
> 20060127_225027.exv Exif.CanonSi.0x0001 Short 1 0
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list