[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=491474f

The following commit has been merged in the master branch:
commit 491474f8e9bb809d10303cc798611b831d85990c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Apr 2 01:44:13 2004 +0000

    Minor changes
---
 src/makernote.cpp | 7 ++++---
 src/makernote.hpp | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index e952432..75fc37f 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      makernote.cpp
-  Version:   $Name:  $ $Revision: 1.13 $
+  Version:   $Name:  $ $Revision: 1.14 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.13 $ $RCSfile: makernote.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.14 $ $RCSfile: makernote.cpp,v $")
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -127,7 +127,7 @@ namespace Exif {
         if (!prefix_.empty()) {
             // Check if makernote is long enough and starts with prefix
             if (   len <= static_cast<long>(prefix_.size())
-                   || prefix_ != std::string(buf, prefix_.size())) rc = 2;
+                || prefix_ != std::string(buf, prefix_.size())) rc = 2;
         }
         if (!absOffset_) {
             // Use offsets relative to the start of the Makernote field
@@ -152,6 +152,7 @@ namespace Exif {
 #ifdef DEBUG_MAKERNOTE
         hexdump(std::cerr, buf, len, offset);
         if (rc == 0) ifd_.print(std::cerr);
+        else std::cerr << "IfdMakerNote::read() failed, rc = " << rc << "
";
 #endif
         return rc;
     } // IfdMakerNote::read
diff --git a/src/makernote.hpp b/src/makernote.hpp
index 60633c5..51cf266 100644
--- a/src/makernote.hpp
+++ b/src/makernote.hpp
@@ -22,7 +22,7 @@
   @file    makernote.hpp
   @brief   Contains the %Exif %MakerNote interface, IFD %MakerNote and a 
            MakerNote factory
-  @version $Name:  $ $Revision: 1.12 $
+  @version $Name:  $ $Revision: 1.13 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -264,7 +264,7 @@ namespace Exif {
 
     protected:
         //! Prefix before the start of the IFD
-        std::string prefix_;  
+        std::string prefix_;
         /*!
           True:  Offsets are from start of the TIFF header
           False: Offsets are from start of the makernote

-- 
exiv2 packaging