[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=93d8dd7

The following commit has been merged in the master branch:
commit 93d8dd7e1fe76a03ddb4c8b0cca834b4fe7bc1c8
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jul 28 15:55:07 2004 +0000

    Fix for masked Exiv2::ifd1 (Joseph Heled)
---
 src/exif.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 51bd7e5..07c9fad 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.50 $
+  Version:   $Name:  $ $Revision: 1.51 $
   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.50 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.51 $ $RCSfile: exif.cpp,v $")
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -773,7 +773,7 @@ namespace Exiv2 {
         long ifd1Offset   = gpsIfdOffset + gpsIfd.size() + gpsIfd.dataSize();
 
         // build IFD1 from updated metadata if there is a thumbnail
-        Ifd ifd1(ifd1, ifd1Offset);
+        Ifd ifd1(Exiv2::ifd1, ifd1Offset);
         if (pThumbnail_) {
             // Update Exif data from thumbnail
             pThumbnail_->update(*this);

-- 
exiv2 packaging