[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=1c32314

The following commit has been merged in the master branch:
commit 1c32314c107b9b1d07f833081cbd070a771c75d3
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Nov 17 04:30:48 2011 +0000

    #797: TiffBinaryArray::doCount(): Replaced assertion with a check for type size which sets it to 1 for unknown types. (Clint Rogers)
---
 src/tiffcomposite.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index fd44dd4..250994f 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -1046,7 +1046,17 @@ namespace Exiv2 {
 
         TypeId typeId = toTypeId(tiffType(), tag(), group());
         long typeSize = TypeInfo::typeSize(typeId);
-        assert(typeSize != 0);
+        if (0 == typeSize) {
+#ifndef SUPPRESS_WARNINGS
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << " has unknown Exif (TIFF) type " << std::dec << tiffType()
+                        << "; setting type size 1.
";
+#endif
+            typeSize = 1;
+        }
+
         return static_cast<uint32_t>(static_cast<double>(size()) / typeSize + 0.5);
     }
 

-- 
exiv2 packaging