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

The following commit has been merged in the master branch:
commit fda2c0a3d1661fd50190f3561724eed3f9fc6df2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jul 13 15:14:50 2008 +0000

    Fixed reading of Exif.CanonCs.Lens.
---
 src/tiffvisitor.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 96711c2..120192a 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -1413,13 +1413,17 @@ namespace Exiv2 {
 
         readTiffEntry(object);
         // Todo: size here is that of the data area
-        uint16_t s = static_cast<uint16_t>(object->size_ / object->elSize());
-        for (uint16_t i = 0; i < s; ++i) {
+        const uint16_t sz = static_cast<uint16_t>(object->size_ / object->elSize());
+        for (uint16_t i = 0; i < sz; ++i) {
             uint16_t tag = i;
             TiffComponent::AutoPtr tc = create(tag, object->elGroup());
             assert(tc.get());
             tc->setStart(object->pData() + i * object->elSize());
             object->addChild(tc);
+            // Hack: Exif.CanonCs.Lens has 3 components
+            if (object->elGroup() == Group::canoncs && tag == 0x0017) {
+                i += 2;
+            }
         }
 
     } // TiffReader::visitArrayEntry
@@ -1430,6 +1434,10 @@ namespace Exiv2 {
 
         uint16_t type = object->elTypeId();
         uint32_t size = TypeInfo::typeSize(TypeId(type));
+        // Hack: Exif.CanonCs.Lens has 3 components
+        if (object->group() == Group::canoncs && object->tag() == 0x0017) {
+            size *= 3;
+        }
         byte* pData   = object->start();
         assert(pData >= pData_);
 

-- 
exiv2 packaging