[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=25404d5

The following commit has been merged in the master branch:
commit 25404d55e59debe20789ed9085b32085d7df6848
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Sep 21 15:57:55 2004 +0000

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

diff --git a/src/exif.cpp b/src/exif.cpp
index e947aad..2c01c62 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.61 $
+  Version:   $Name:  $ $Revision: 1.62 $
   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.61 $ $RCSfile: exif.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.62 $ $RCSfile: exif.cpp,v $");
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -180,8 +180,8 @@ namespace Exiv2 {
         pos1 = key_.find('.', pos0);
         if (pos1 == std::string::npos) throw Error("Invalid key");
         std::string ifdItem = key_.substr(pos0, pos1 - pos0);
-        pos0 = pos1 + 1;
-        std::string tagName = key_.substr(pos0);
+        if (ifdItem == "") throw Error("Invalid key");
+        std::string tagName = key_.substr(pos1 + 1);
         if (tagName == "") throw Error("Invalid key");
 
         // Find IfdId
diff --git a/src/exif.hpp b/src/exif.hpp
index d61586a..265ab7e 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    exif.hpp
   @brief   Encoding and decoding of Exif data
-  @version $Name:  $ $Revision: 1.53 $
+  @version $Name:  $ $Revision: 1.54 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -135,10 +135,10 @@ namespace Exiv2 {
         void makeKey();
         /*!
           @brief Parse and convert the key string into tag and IFD Id. 
-                 Updates data memebers if the string can be decomposed,
+                 Updates data members if the string can be decomposed,
                  or throws Error ("Invalid key").
 
-          @throw Error ("Invalid key") Todo: add conditions
+          @throw Error ("Invalid key") if the key cannot be decomposed.
          */
         void decomposeKey();
         //@}

-- 
exiv2 packaging