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

The following commit has been merged in the master branch:
commit ebfc63dc56c01cd27f73ccdf6d4b0fc177a07f11
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Mar 18 16:08:24 2004 +0000

    Added invalidByteOrder and changed invalid to invalidTypeId
---
 src/types.cpp | 6 +++---
 src/types.hpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/types.cpp b/src/types.cpp
index ddf50af..1e0ef0b 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Name:  $ $Revision: 1.4 $
+  Version:   $Name:  $ $Revision: 1.5 $
   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.4 $ $RCSfile: types.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: types.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -51,7 +51,7 @@ namespace Exif {
 
     //! Lookup list of supported IFD type information
     const TypeInfoTable TypeInfo::typeInfoTable_[] = {
-        TypeInfoTable(invalid,          "Invalid",     0),
+        TypeInfoTable(invalidTypeId,    "Invalid",     0),
         TypeInfoTable(unsignedByte,     "Byte",        1),
         TypeInfoTable(asciiString,      "Ascii",       1),
         TypeInfoTable(unsignedShort,    "Short",       2),
diff --git a/src/types.hpp b/src/types.hpp
index 51e19ad..30b1f23 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.6 $
+  @version $Name:  $ $Revision: 1.7 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -61,10 +61,10 @@ namespace Exif {
     typedef std::pair<int32, int32> Rational;
 
     //! Type to express the byte order (little or big endian)
-    enum ByteOrder { littleEndian, bigEndian };
+    enum ByteOrder { invalidByteOrder, littleEndian, bigEndian };
 
     //! Type identifiers for IFD format types
-    enum TypeId { invalid, unsignedByte, asciiString, unsignedShort, 
+    enum TypeId { invalidTypeId, unsignedByte, asciiString, unsignedShort, 
                   unsignedLong, unsignedRational, invalid6, undefined,
                   signedShort, signedLong, signedRational };
 

-- 
exiv2 packaging