[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=6b0489a

The following commit has been merged in the master branch:
commit 6b0489a02fcbb7389ae226bae2c3a48444403247
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 4 08:56:54 2004 +0000

    More patches for masked Exiv2::ifd0 and Exiv2::exifIfd (Joseph Heled)
---
 src/exif.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index c965c11..b314930 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.54 $
+  Version:   $Name:  $ $Revision: 1.55 $
   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.54 $ $RCSfile: exif.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.55 $ $RCSfile: exif.cpp,v $");
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -793,11 +793,11 @@ namespace Exiv2 {
     long ExifData::copyFromMetadata(byte* buf)
     {
         // Build IFD0
-        Ifd ifd0(ifd0);
+        Ifd ifd0(Exiv2::ifd0);
         addToIfd(ifd0, begin(), end(), byteOrder());
 
         // Build Exif IFD from metadata
-        Ifd exifIfd(exifIfd);
+        Ifd exifIfd(Exiv2::exifIfd);
         addToIfd(exifIfd, begin(), end(), byteOrder());
         MakerNote* pMakerNote = 0;
         if (pMakerNote_) {

-- 
exiv2 packaging