[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=85a1b36

The following commit has been merged in the master branch:
commit 85a1b363a21e674ced64c45888d0dfc1db4a2fd7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 31 16:42:56 2004 +0000

    Fixed TypeInfoTable to return invalid if typeId is too large
---
 src/types.cpp | 8 ++++----
 src/types.hpp | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/types.cpp b/src/types.cpp
index 05dae6e..b628760 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Name:  $ $Revision: 1.7 $
+  Version:   $Name:  $ $Revision: 1.8 $
   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.7 $ $RCSfile: types.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.8 $ $RCSfile: types.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -66,12 +66,12 @@ namespace Exiv2 {
 
     const char* TypeInfo::typeName(TypeId typeId)
     {
-        return typeInfoTable_[typeId].name_;
+        return typeInfoTable_[ typeId < lastTypeId ? typeId : 0 ].name_;
     }
 
     long TypeInfo::typeSize(TypeId typeId)
     {
-        return typeInfoTable_[typeId].size_;
+        return typeInfoTable_[ typeId < lastTypeId ? typeId : 0 ].size_;
     }
 
     // *************************************************************************
diff --git a/src/types.hpp b/src/types.hpp
index 669ece1..e56a7c3 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    types.hpp
   @brief   Type definitions for %Exiv2 and related functionality
-  @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    09-Jan-04, ahu: created
@@ -66,12 +66,13 @@ namespace Exiv2 {
     //! Type identifiers for IFD format types
     enum TypeId { invalidTypeId, unsignedByte, asciiString, unsignedShort, 
                   unsignedLong, unsignedRational, invalid6, undefined,
-                  signedShort, signedLong, signedRational };
+                  signedShort, signedLong, signedRational, 
+                  lastTypeId };
 
     //! Type to specify the IFD to which a metadata belongs
     enum IfdId { ifdIdNotSet, 
                  ifd0, exifIfd, gpsIfd, makerIfd, iopIfd, ifd1, 
-                 lastIfdId};
+                 lastIfdId };
 
 // *****************************************************************************
 // class definitions

-- 
exiv2 packaging