[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=5971013

The following commit has been merged in the master branch:
commit 59710139c22530f62954f162c33169ab4f5ab4fa
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 6 17:55:27 2006 +0000

    Added Minolta makernote to new TIFF parser.
---
 src/makernote2.cpp    | 28 ++++++++++++++++++++--------
 src/makernote2.hpp    | 39 ++++++++++++++++++++++++---------------
 src/tiffcomposite.cpp |  1 +
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index 7ca598c..49fa2cd 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -49,14 +49,16 @@ EXIV2_RCSID("@(#) $Id$");
 namespace Exiv2 {
 
     const TiffMnRegistry TiffMnCreator::registry_[] = {
-        { "Canon",     newCanonMn,     Group::canonmn },
-        { "FOVEON",    newSigmaMn,     Group::sigmamn },
-        { "FUJIFILM",  newFujiMn,      Group::fujimn  },
-        { "NIKON",     newNikonMn,     Group::nikonmn },
-        { "OLYMPUS",   newOlympusMn,   Group::olympmn },
-        { "Panasonic", newPanasonicMn, Group::panamn  },
-        { "SIGMA",     newSigmaMn,     Group::sigmamn },
-        { "SONY",      newSonyMn,      Group::sonymn  }
+        { "Canon",          newCanonMn,     Group::canonmn   },
+        { "FOVEON",         newSigmaMn,     Group::sigmamn   },
+        { "FUJIFILM",       newFujiMn,      Group::fujimn    },
+        { "KONICA MINOLTA", newMinoltaMn,   Group::minoltamn },
+        { "Minolta",        newMinoltaMn,   Group::minoltamn },
+        { "NIKON",          newNikonMn,     Group::nikonmn   },
+        { "OLYMPUS",        newOlympusMn,   Group::olympmn   },
+        { "Panasonic",      newPanasonicMn, Group::panamn    },
+        { "SIGMA",          newSigmaMn,     Group::sigmamn   },
+        { "SONY",           newSonyMn,      Group::sonymn    }
     };
 
     bool TiffMnRegistry::operator==(const TiffMnRegistry::Key& key) const
@@ -338,6 +340,16 @@ namespace Exiv2 {
         return new TiffIfdMakernote(tag, group, mnGroup, 0);
     }
 
+    TiffComponent* newMinoltaMn(uint16_t    tag,
+                                uint16_t    group,
+                                uint16_t    mnGroup,
+                                const byte* /*pData*/,
+                                uint32_t    /*size*/, 
+                                ByteOrder   /*byteOrder*/)
+    {
+        return new TiffIfdMakernote(tag, group, mnGroup, 0);
+    }
+
     TiffComponent* newOlympusMn(uint16_t    tag,
                                 uint16_t    group,
                                 uint16_t    mnGroup,
diff --git a/src/makernote2.hpp b/src/makernote2.hpp
index 58d740d..0ae2989 100644
--- a/src/makernote2.hpp
+++ b/src/makernote2.hpp
@@ -43,21 +43,22 @@
 namespace Exiv2 {
 
     namespace Group {
-        const uint16_t olympmn  = 257; //!< Olympus makernote
-        const uint16_t fujimn   = 258; //!< Fujifilm makernote
-        const uint16_t canonmn  = 259; //!< Canon makernote
-        const uint16_t canoncs  = 260; //!< Canon camera settings
-        const uint16_t canonsi  = 261; //!< Canon shot info
-        const uint16_t canoncf  = 262; //!< Canon customer functions
-        const uint16_t nikonmn  = 263; //!< Any Nikon makernote (pseudo group)
-        const uint16_t nikon1mn = 264; //!< Nikon1 makernote
-        const uint16_t nikon2mn = 265; //!< Nikon2 makernote
-        const uint16_t nikon3mn = 266; //!< Nikon3 makernote
-        const uint16_t panamn   = 267; //!< Panasonic makernote
-        const uint16_t sigmamn  = 268; //!< Sigma makernote
-        const uint16_t sonymn   = 269; //!< Any Sony makernote (pseudo group)
-        const uint16_t sony1mn  = 270; //!< Sony1 makernote
-        const uint16_t sony2mn  = 271; //!< Sony2 makernote
+        const uint16_t olympmn   = 257; //!< Olympus makernote
+        const uint16_t fujimn    = 258; //!< Fujifilm makernote
+        const uint16_t canonmn   = 259; //!< Canon makernote
+        const uint16_t canoncs   = 260; //!< Canon camera settings
+        const uint16_t canonsi   = 261; //!< Canon shot info
+        const uint16_t canoncf   = 262; //!< Canon customer functions
+        const uint16_t nikonmn   = 263; //!< Any Nikon makernote (pseudo group)
+        const uint16_t nikon1mn  = 264; //!< Nikon1 makernote
+        const uint16_t nikon2mn  = 265; //!< Nikon2 makernote
+        const uint16_t nikon3mn  = 266; //!< Nikon3 makernote
+        const uint16_t panamn    = 267; //!< Panasonic makernote
+        const uint16_t sigmamn   = 268; //!< Sigma makernote
+        const uint16_t sonymn    = 269; //!< Any Sony makernote (pseudo group)
+        const uint16_t sony1mn   = 270; //!< Sony1 makernote
+        const uint16_t sony2mn   = 271; //!< Sony2 makernote
+        const uint16_t minoltamn = 272; //!< Minolta makernote
     }
 
 // *****************************************************************************
@@ -469,6 +470,14 @@ namespace Exiv2 {
                               uint32_t    size, 
                               ByteOrder   byteOrder);
 
+    //! Function to create a Minolta makernote
+    TiffComponent* newMinoltaMn(uint16_t    tag,
+                                uint16_t    group,
+                                uint16_t    mnGroup,
+                                const byte* pData,
+                                uint32_t    size, 
+                                ByteOrder   byteOrder);
+
     //! Function to create an Olympus makernote
     TiffComponent* newOlympusMn(uint16_t    tag,
                                 uint16_t    group,
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 29e7d1e..d868f6d 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -114,6 +114,7 @@ namespace Exiv2 {
         // 269 not needed (sonymn)
         case 270: group = "Sony";      break;
         case 271: group = "Sony";      break;
+        case 272: group = "Minolta";   break;
         default:  group = "Unknown";   break;
         }
         return group;

-- 
exiv2 packaging