[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=54e126d

The following commit has been merged in the master branch:
commit 54e126d3e4c462ef7e698774ff02e12fc3670d39
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 5 05:48:01 2004 +0000

    Appended one more Id to an Ifd id to work around a g++-3.4
---
 src/exif.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index bef9a74..a5c4a32 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.56 $
+  Version:   $Name:  $ $Revision: 1.57 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.56 $ $RCSfile: exif.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.57 $ $RCSfile: exif.cpp,v $");
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -288,7 +288,7 @@ namespace Exiv2 {
         // Copy the TIFF header
         TiffHeader tiffHeader(byteOrder);
         if (len < tiffHeader.size()) rc = 1;
-        Ifd ifd1(ifd1);
+        Ifd ifd1(ifd1Id);
         long ifdOffset = 0;
         if (rc == 0) {
             buflen += tiffHeader.copy(img.pData_);

-- 
exiv2 packaging