[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=74137b4

The following commit has been merged in the master branch:
commit 74137b432f089dc49c87ae04458609c8af317f27
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 17 14:00:28 2010 +0000

    Nit-picking fixes and enhancements.
---
 src/makernote.cpp |  8 ++++----
 src/nikonmn.cpp   | 27 ++++++++++++++-------------
 src/nikonmn.hpp   |  2 ++
 src/tiffimage.cpp |  6 +++---
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index cc39c3b..d169db0 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -846,10 +846,10 @@ namespace Exiv2 {
         { 0x0098, "0203",    0, 1,   4 },
         { 0x0098, "0204",    0, 2,   4 },
         // NikonFl
-        { 0x00a8, "0100",    0, 0,   4 },
-        { 0x00a8, "0101",    0, 0,   4 },
-        { 0x00a8, "0102",    0, 1,   4 },
-        { 0x00a8, "0103",    0, 2,   4 },
+        { 0x00a8, "0100",    0, 0,  NA },
+        { 0x00a8, "0101",    0, 0,  NA },
+        { 0x00a8, "0102",    0, 1,  NA },
+        { 0x00a8, "0103",    0, 2,  NA },
     };
 
     int nikonSelector(uint16_t tag, const byte* pData, uint32_t size, TiffComponent* const /*pRoot*/)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index c68d7b0..9364ae6 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -26,6 +26,7 @@
   Version:   $Rev$
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
+             Jens Mueller (jm) <tschensinger at web dot de>
   History:   17-May-04, ahu: created
              25-May-04, ahu: combined all Nikon formats in one component
  */
@@ -2409,7 +2410,7 @@ fmountlens[] = {
                                                             const Value& value, 
                                                             const ExifData*)
     {
-         if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0 || value.toLong() == 255) {
+        if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0 || value.toLong() == 255) {
             return os << "(" << value << ")";
         }
         std::ostringstream oss;
@@ -2432,7 +2433,7 @@ fmountlens[] = {
         long h = long(abs(value.toLong())/60.0);
         long min = abs(value.toLong()) - h*60;
         os << std::fixed << "UTC " << sign << std::setw(2) << std::setfill('0') << h << ":" 
-            << std::setw(2) << std::setfill('0') << min;
+           << std::setw(2) << std::setfill('0') << min;
         os.copyfmt(oss);
         return os;
     }
@@ -2450,24 +2451,24 @@ fmountlens[] = {
         switch(pcval)
         {
         case 0:
-          os << "Normal";
-          break;
+            os << "Normal";
+            break;
         case 127:
-          os << "n/a";
-          break;
+            os << "n/a";
+            break;
         case -127:
-          os << "User";
-          break;
+            os << "User";
+            break;
         case -128:
-          os << "Auto";
-          break;
+            os << "Auto";
+            break;
         default:
-          os << pcval;
-          break;
+            os << pcval;
+            break;
         }
         os.copyfmt(oss);
         return os;
-   }
+    }
 
     std::ostream& Nikon3MakerNote::print0x009a(std::ostream& os,
                                                const Value& value,
diff --git a/src/nikonmn.hpp b/src/nikonmn.hpp
index 17aa668..0cee4fc 100644
--- a/src/nikonmn.hpp
+++ b/src/nikonmn.hpp
@@ -35,6 +35,8 @@
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @author  Gilles Caulier (gc)
            <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @author  Jens Mueller (jm)
+           <a href="mailto:tschensinger at web dot de">tschensinger at web dot de</a>
   @date    17-May-04, ahu: created<BR>
            25-May-04, ahu: combined all Nikon formats in one component
  */
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 3e115c9..c084c05 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -523,7 +523,7 @@ namespace Exiv2 {
         { 8, ttUnsignedShort, 1 }  // File Number
     };
 
-    //! Nikon File Info binary array - configuration
+    //! Nikon Multi Exposure binary array - configuration
     extern const ArrayCfg nikonMeCfg = {
         Group::nikonme,   // Group for the elements
         littleEndian,     // Byte order
@@ -534,7 +534,7 @@ namespace Exiv2 {
         true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
-    //! Nikon File Info binary array - definition
+    //! Nikon Multi Exposure binary array - definition
     extern const ArrayDef nikonMeDef[] = {
         {  0, ttUndefined,     4 }, // Version
         {  4, ttUnsignedLong,  1 }, // MultiExposureMode
@@ -1628,7 +1628,7 @@ namespace Exiv2 {
         // Nikon3 file info
         {  Tag::all, Group::nikonfi,   newTiffBinaryElement                      },
 
-        // Nikon3 file info
+        // Nikon3 multi exposure
         {  Tag::all, Group::nikonme,   newTiffBinaryElement                      },
 
         // Nikon3 flash info

-- 
exiv2 packaging