[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=4ce2156

The following commit has been merged in the master branch:
commit 4ce21560f773d125853540672e237430345437d7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri May 19 13:04:18 2006 +0000

    Experimental support for Olympus Camera Settings
---
 src/tiffparser.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/tiffparser.cpp b/src/tiffparser.cpp
index fa1c692..a12d12f 100644
--- a/src/tiffparser.cpp
+++ b/src/tiffparser.cpp
@@ -83,13 +83,14 @@ EXIV2_RCSID("@(#) $Id$");
 namespace Exiv2 {
 
     /*
-      This table describes the standard TIFF layout and determines the
-      corresponding Exiv2 TIFF components. The key of the table consists of the
-      first two attributes, (extended) tag and group. Tag is the TIFF tag or one
-      of a few extended tags, group identifies the IFD or any other composite
-      TIFF component. Each entry of the table defines for a particular tag and
-      group combination, which create function is used and what the group of the
-      new component is.
+      This table describes the standard TIFF layout (including non-standard
+      Makernote structures) and determines the corresponding Exiv2 TIFF
+      components. The key of the table consists of the first two attributes,
+      (extended) tag and group. Tag is the TIFF tag or one of a few extended
+      tags, group identifies the IFD or any other composite TIFF component. 
+      Each entry of the table defines for a particular tag and group
+      combination, which create function is used and what the group of the new
+      component is.
      */
     const TiffStructure TiffCreator::tiffStructure_[] = {
         // ext. tag  group             create function       new group
@@ -113,6 +114,9 @@ namespace Exiv2 {
         {  Tag::all, Group::canoncs,   newTiffArrayElement<unsignedShort>, Group::canoncs },
         {  Tag::all, Group::canonsi,   newTiffArrayElement<unsignedShort>, Group::canonsi },
         {  Tag::all, Group::canoncf,   newTiffArrayElement<unsignedShort>, Group::canoncf },
+        // Some Olympus cameras use Minolta structures
+        {    0x0001, Group::olympmn,   newTiffArrayEntry<4>, Group::minocso },
+        {    0x0003, Group::olympmn,   newTiffArrayEntry<4>, Group::minocsn },
         // Minolta makernote structure
         {    0x0001, Group::minoltamn, newTiffArrayEntry<4>, Group::minocso },
         {    0x0003, Group::minoltamn, newTiffArrayEntry<4>, Group::minocsn },
@@ -122,7 +126,6 @@ namespace Exiv2 {
         {  Tag::all, Group::minocsn,   newTiffArrayElement<unsignedLong,  bigEndian>, Group::minocsn },
         {  Tag::all, Group::minocs7,   newTiffArrayElement<unsignedShort, bigEndian>, Group::minocs7 },
         {  Tag::all, Group::minocs5,   newTiffArrayElement<unsignedShort, bigEndian>, Group::minocs5 }
-
     };
 
     TiffComponent::AutoPtr TiffCreator::create(uint32_t extendedTag,

-- 
exiv2 packaging