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

The following commit has been merged in the master branch:
commit eb9541f1728912173941797a8f7c94f7d775b3bc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 9 04:29:45 2004 +0000

    Makernote write support, part 3 (differentiate memory management modes, do not sort makernote)
---
 src/exif.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index f44bd4f..cd77e27 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.26 $
+  Version:   $Name:  $ $Revision: 1.27 $
   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.26 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.27 $ $RCSfile: exif.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -505,9 +505,9 @@ namespace Exif {
         Ifd::iterator make = ifd0_.findTag(0x010f);
         Ifd::iterator model = ifd0_.findTag(0x0110);
         if (pos != exifIfd_.end() && make != ifd0_.end() && model != ifd0_.end()) {
-            MakerNoteFactory& makerNoteFactory = MakerNoteFactory::instance();
+            MakerNoteFactory& mnf = MakerNoteFactory::instance();
             // Todo: The conversion to string assumes that there is a 

-- 
exiv2 packaging