[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=0fb943c

The following commit has been merged in the master branch:
commit 0fb943c23e763e58d0da9f6a8fc4ad2512953632
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 21 15:57:34 2004 +0000

    Changed order of enum TypeId back to be in sync with Exif type ids
---
 src/types.cpp |  8 ++++----
 src/types.hpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/types.cpp b/src/types.cpp
index 3df1bad..1e20eee 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Name:  $ $Revision: 1.11 $
+  Version:   $Name:  $ $Revision: 1.12 $
   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.11 $ $RCSfile: types.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.12 $ $RCSfile: types.cpp,v $");
 
 // *****************************************************************************
 // included header files
@@ -54,7 +54,6 @@ namespace Exiv2 {
         TypeInfoTable(invalidTypeId,    "Invalid",     0),
         TypeInfoTable(unsignedByte,     "Byte",        1),
         TypeInfoTable(asciiString,      "Ascii",       1),
-        TypeInfoTable(string,           "String",      1),
         TypeInfoTable(unsignedShort,    "Short",       2),
         TypeInfoTable(unsignedLong,     "Long",        4),
         TypeInfoTable(unsignedRational, "Rational",    8),
@@ -63,6 +62,7 @@ namespace Exiv2 {
         TypeInfoTable(signedShort,      "SShort",      2),
         TypeInfoTable(signedLong,       "SLong",       4),
         TypeInfoTable(signedRational,   "SRational",   8),
+        TypeInfoTable(string,           "String",      1),
         TypeInfoTable(date,             "Date",        8),
         TypeInfoTable(time,             "Time",        11)
     };
@@ -227,7 +227,7 @@ namespace Exiv2 {
                 byte c = buf[i];
                 os << std::setw(2) << std::setfill('0') 
                    << std::hex << (int)c << " ";
-                ss << ((int)c >= 31 && (int)c < 127 ? buf[i] : '.');
+                ss << ((int)c >= 31 && (int)c < 127 ? char(buf[i]) : '.');
             } while (++i < len && i%16 != 0);
             std::string::size_type width = 9 + ((i-1)%16 + 1) * 3;
             os << (width > pos ? "" : align.substr(width)) << ss.str() << "
";
diff --git a/src/types.hpp b/src/types.hpp
index ec78bc5..7dedd77 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.18 $
+  @version $Name:  $ $Revision: 1.19 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created<BR>
@@ -77,10 +77,10 @@ namespace Exiv2 {
     enum ByteOrder { invalidByteOrder, littleEndian, bigEndian };
 
     //! Type identifiers for IFD format types
-    enum TypeId { invalidTypeId, unsignedByte, asciiString, string,
-                  unsignedShort, unsignedLong, unsignedRational, invalid6,
-                  undefined, signedShort, signedLong, signedRational, 
-                  date, time,
+    enum TypeId { invalidTypeId, unsignedByte, asciiString, unsignedShort, 
+                  unsignedLong, unsignedRational, invalid6, undefined, 
+                  signedShort, signedLong, signedRational, 
+                  string, date, time,
                   lastTypeId };
 
     //! Type to specify the IFD to which a metadata belongs

-- 
exiv2 packaging