[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3a5066c

The following commit has been merged in the master branch:
commit 3a5066cf73b38119e94f1d479e1b030fda5f21bb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun May 21 09:12:25 2006 +0000

    Updated exiv2 summary output, minor fixes to Nikon NEF and Sony SR2 handling
---
 src/actions.cpp     | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/tiffvisitor.cpp |  9 ++++---
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 4c024d3..aaa9991 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -340,6 +340,18 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Nikon3.ISOSpeed");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsNew.ISOSpeed");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsOld.ISOSpeed");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs5D.ISOSpeed");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs7D.ISOSpeed");
+        }
         std::cout << std::endl;
 
         // Exposure mode
@@ -352,6 +364,18 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.CanonCs1.ExposureProgram");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs7D.ExposureMode");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs5D.ExposureMode");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsNew.ExposureMode");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsOld.ExposureMode");
+        }
         std::cout << std::endl;
 
         // Metering mode
@@ -373,6 +397,12 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Panasonic.Macro");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsNew.MacroMode");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsOld.MacroMode");
+        }
         std::cout << std::endl;
 
         // Image quality setting (compression)
@@ -403,16 +433,41 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Panasonic.Quality");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Minolta.Quality");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsNew.Quality");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsOld.Quality");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs5D.Quality");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs7D.Quality");
+        }
         std::cout << std::endl;
 
         // Exif Resolution
         printLabel("Exif Resolution");
         long xdim = 0;
         long ydim = 0;
-        md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelXDimension"));
-        if (md != exifData.end()) xdim = md->toLong();
-        md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelYDimension"));
-        if (md != exifData.end()) ydim = md->toLong();
+        md = exifData.findKey(Exiv2::ExifKey("Exif.Image.ImageWidth"));
+        if (md == exifData.end()) {
+            md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelXDimension"));
+        }
+        if (md != exifData.end()) {
+            xdim = md->toLong();
+        }
+        md = exifData.findKey(Exiv2::ExifKey("Exif.Image.ImageLength"));
+        if (md == exifData.end()) {
+            md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelYDimension"));
+        }
+        if (md != exifData.end()) {
+            ydim = md->toLong();
+        }
         if (xdim != 0 && ydim != 0) {
             std::cout << xdim << " x " << ydim;
         }
@@ -446,6 +501,18 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Panasonic.WhiteBalance");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs5D.WhiteBalance");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCs7D.WhiteBalance");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsNew.WhiteBalance");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.MinoltaCsOld.WhiteBalance");
+        }
         std::cout << std::endl;
 
         // Thumbnail
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index c21a79f..7a4d777 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -56,9 +56,12 @@ namespace Exiv2 {
     // TIFF Decoder table for special decoding requirements
     const TiffDecoderInfo TiffMetadataDecoder::tiffDecoderInfo_[] = {
         { "*",       Tag::all, Group::ignr,    0 }, // Do not decode tags with group == Group::ignr
-        { "OLYMPUS",   0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb },
-        { "NIKON",   Tag::all, Group::sub0_0,  0 },
-        { "NIKON",   Tag::all, Group::sub0_1,  &TiffMetadataDecoder::decodeToGroup<Group::ifd0> }
+        { "OLYMPUS",   0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb           },
+        { "NIKON",     0x014a, Group::ifd0,    0 }, // Todo: Controversial, causes problems with Exiftool
+        { "NIKON",   Tag::all, Group::sub0_0,  &TiffMetadataDecoder::decodeToGroup<Group::ifd0> },
+        { "NIKON",   Tag::all, Group::sub0_1,  &TiffMetadataDecoder::decodeToGroup<Group::ifd0> },
+        { "SONY",      0x014a, Group::ifd0,    0 }, // Todo: see above
+        { "SONY",    Tag::all, Group::sub0_0,  &TiffMetadataDecoder::decodeToGroup<Group::ifd0> }
     };
 
     bool TiffDecoderInfo::operator==(const TiffDecoderInfo::Key& key) const

-- 
exiv2 packaging