[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=948142a

The following commit has been merged in the master branch:
commit 948142ae938161f22909fa5fab7613ac6f723471
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 11 16:02:52 2012 +0000

    #819: Fixed write support.
---
 src/tiffcomposite.cpp | 2 +-
 src/tiffimage.cpp     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index dd52064..8ec2ebf 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -1034,7 +1034,7 @@ namespace Exiv2 {
         }
         // Count of IFD makernote in tag Exif.Photo.MakerNote is the size of the
         // Makernote in bytes
-        assert(tiffType() == ttUndefined);
+        assert(tiffType() == ttUndefined || tiffType() == ttUnsignedByte || tiffType() == ttSignedByte);
         return mn_->size();
     }
 
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index cd01f50..e057125 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -1228,6 +1228,7 @@ namespace Exiv2 {
         { Tag::root, nikonFl3Id,       nikon3Id,         0x00a8    },
         { Tag::root, panasonicId,      exifId,           0x927c    },
         { Tag::root, pentaxId,         exifId,           0x927c    },
+        { Tag::root, pentaxDngId,      ifd0Id,           0xc634    },
         { Tag::root, samsung2Id,       exifId,           0x927c    },
         { Tag::root, samsungPwId,      samsung2Id,       0x0021    },
         { Tag::root, samsungPvId,      samsung2Id,       0x0035    },
@@ -1625,10 +1626,10 @@ namespace Exiv2 {
         {  Tag::all, panasonicId,      newTiffEntry                              },
 
         // Pentax DNG makernote
-        {    0x0003, pentaxDngId,         newTiffThumbSize<0x0004, pentaxDngId>        },
-        {    0x0004, pentaxDngId,         newTiffThumbData<0x0003, pentaxDngId>        },
-        { Tag::next, pentaxDngId,         newTiffDirectory<ignoreId>                },
-        {  Tag::all, pentaxDngId,         newTiffEntry                              },
+        {    0x0003, pentaxDngId,      newTiffThumbSize<0x0004, pentaxDngId>     },
+        {    0x0004, pentaxDngId,      newTiffThumbData<0x0003, pentaxDngId>     },
+        { Tag::next, pentaxDngId,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, pentaxDngId,      newTiffEntry                              },
 
         // Pentax makernote
         {    0x0003, pentaxId,         newTiffThumbSize<0x0004, pentaxId>        },

-- 
exiv2 packaging