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

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

    #819: Changed PentaxId to PentaxDngId and some formatting tweaks.
---
 src/makernote.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 1a71ede..b08efef 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -865,19 +865,19 @@ namespace Exiv2 {
                                uint32_t    size,
                                ByteOrder   /*byteOrder*/)
     {
-	if (size > 8 && std::string(reinterpret_cast<const char*>(pData), 8)
-                        == std::string("PENTAX 

-- 
exiv2 packaging