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

The following commit has been merged in the master branch:
commit 75957177b5a5826b21a1f1d0abb12b89eaf674d7
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Jul 29 09:11:12 2008 +0000

    compile with gcc 4.3.1. Fix warnings
---
 src/pngchunk.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index a3768cc..f31c00d 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -39,8 +39,11 @@ EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $")
 
 //#define DEBUG 1
 
+extern "C"
+{
 // To uncompress or compress text chunk
 #include <zlib.h>
+}
 
 #include "pngchunk.hpp"
 #include "tiffimage.hpp"
@@ -54,6 +57,7 @@ EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $")
 #include <cstring>
 #include <iostream>
 #include <cassert>
+#include <cstdarg>
 
 /*
 
@@ -756,7 +760,7 @@ namespace Exiv2
             {
                 if ((*q++=(*p++)) == '

-- 
exiv2 packaging