[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=266dbad

The following commit has been merged in the master branch:
commit 266dbad6268227d7e13b6419a1c8b2daa01cb39f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 12 06:41:40 2005 +0000

    Updated utility to use some of the new Makernote tags in the summary print output, updated tests accordingly
---
 src/actions.cpp          | 34 ++++++++++++++++++++++++++++++++--
 test/data/exiv2-test.out | 12 ++++++------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 8da34be..53e21b7 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -250,7 +250,19 @@ namespace Action {
 
         // Todo: Flash bias, flash energy
         // Todo: Implement this for other cameras
-        printTag(exifData, "Exif.CanonCs2.FlashBias", "Flash bias");
+        bool done = false;
+        std::cout << std::setw(align_) << std::setfill(' ') << std::left
+                  << "Flash bias" << ": ";        
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.CanonCs2.FlashBias");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Panasonic.FlashBias");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Olympus.FlashBias");
+        }
+        std::cout << std::endl;
 
         // Actual focal length and 35 mm equivalent
         // Todo: Calculate 35 mm equivalent a la jhead
@@ -268,7 +280,7 @@ namespace Action {
         // Subject distance
         std::cout << std::setw(align_) << std::setfill(' ') << std::left
                   << "Subject distance" << ": ";
-        bool done = false;
+        done = false;
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Photo.SubjectDistance");
         }
@@ -326,6 +338,12 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Fujifilm.Macro");
         }            
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Olympus.Macro");
+        }            
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Panasonic.Macro");
+        }            
         std::cout << std::endl;
 
         // Image quality setting (compression)
@@ -351,6 +369,12 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Nikon3.Quality");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Olympus.Quality");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Panasonic.Quality");
+        }
         std::cout << std::endl;
 
         // Exif Resolution
@@ -390,6 +414,12 @@ namespace Action {
         if (!done) {
             done = 0 != printTag(exifData, "Exif.Nikon3.WhiteBalance");
         }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Olympus.WhiteBalance");
+        }
+        if (!done) {
+            done = 0 != printTag(exifData, "Exif.Panasonic.WhiteBalance");
+        }
         std::cout << std::endl;
 
         // Thumbnail
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 462536d..c9f63d8 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -358,8 +358,8 @@ Subject distance:
 ISO speed       : 50
 Exposure mode   : Aperture priority
 Metering mode   : Matrix
-Macro mode      : 
-Image quality   : 
+Macro mode      : Off
+Image quality   : (7)
 Exif Resolution : 3264 x 2448
 White balance   : 
 Thumbnail       : JPEG, 7306 Bytes
@@ -377,16 +377,16 @@ Exposure time   : 1/400 s
 Aperture        : F4.5
 Exposure bias   : 0
 Flash           : No, compulsory
-Flash bias      : 
+Flash bias      : 0
 Focal length    : 6.0 mm (35 mm equivalent: 36.0 mm)
 Subject distance: 
 ISO speed       : 80
 Exposure mode   : Auto
 Metering mode   : Matrix
-Macro mode      : 
-Image quality   : 
+Macro mode      : Off
+Image quality   : High
 Exif Resolution : 2560 x 1920
-White balance   : 
+White balance   : Auto
 Thumbnail       : JPEG, 10308 Bytes
 Copyright       : 
 Exif comment    : 

-- 
exiv2 packaging