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

The following commit has been merged in the master branch:
commit bdbdbf2360eb59cbe8670909d9f2622bec3d33aa
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jul 10 04:45:42 2012 +0000

    fixed typos to build with ./configure "CXXFLAGS=-DDEBUG -ggdb"
---
 src/exif.cpp                     | 2 +-
 src/tiffimage.cpp                | 2 +-
 xmpsdk/include/XMP_Environment.h | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 51f02e8..dcd81f7 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -828,7 +828,7 @@ namespace Exiv2 {
         append(blob, mio2.mmap(), mio2.size());
 #ifdef DEBUG
         if (wm == wmIntrusive) {
-            std::cerr << "SIZE OF EXIF DATA IS " << std::dec << io.size() << " BYTES
";
+            std::cerr << "SIZE OF EXIF DATA IS " << std::dec << mio2.size() << " BYTES
";
         }
         else {
             std::cerr << "SIZE DOESN'T MATTER, NON-INTRUSIVE WRITING USED
";
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index f2d1cc0..35fe41c 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -2171,7 +2171,7 @@ namespace Exiv2 {
             return true;
         }
 #ifdef DEBUG
-        std::cerr << "Not an image tag: " << key << " (4)
";
+        std::cerr << "Not an image tag: " << tag << " (4)
";
 #endif
         return false;
     }
diff --git a/xmpsdk/include/XMP_Environment.h b/xmpsdk/include/XMP_Environment.h
index a6b6c6c..e855457 100644
--- a/xmpsdk/include/XMP_Environment.h
+++ b/xmpsdk/include/XMP_Environment.h
@@ -96,7 +96,10 @@
 
 #if defined ( DEBUG )
     #if defined ( NDEBUG )
-        #error "XMP environment error - both DEBUG and NDEBUG are defined"
+		#undef NDEBUG
+		#warning
+		#warning "XMP environment - DEBUG and NDEBUG defined.  NDEBUG has been undefined"
+		#warning
     #endif
     #define XMP_DebugBuild 1
 #endif

-- 
exiv2 packaging