[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=6852f76

The following commit has been merged in the master branch:
commit 6852f76c790ab52b6cacd07d7de75932e33041f1
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 31 17:21:02 2004 +0000

    Fixed MSVC errors and warnings (Steve, sking_1.patch, only types.cpp)
---
 src/types.cpp | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/types.cpp b/src/types.cpp
index b628760..8655ed2 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Name:  $ $Revision: 1.8 $
+  Version:   $Name:  $ $Revision: 1.9 $
   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.8 $ $RCSfile: types.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: types.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -138,12 +138,12 @@ namespace Exiv2 {
     long us2Data(char* buf, uint16 s, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
-            buf[0] =  s & 0x00ff;
-            buf[1] = (s & 0xff00) >> 8;
+            buf[0] =  (char)(s & 0x00ff);
+            buf[1] = (char)((s & 0xff00) >> 8);
         }
         else {
-            buf[0] = (s & 0xff00) >> 8;
-            buf[1] =  s & 0x00ff;
+            buf[0] = (char)((s & 0xff00) >> 8);
+            buf[1] =  (char)(s & 0x00ff);
         }
         return 2;
     }
@@ -151,16 +151,16 @@ namespace Exiv2 {
     long ul2Data(char* buf, uint32 l, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
-            buf[0] =  l & 0x000000ff;
-            buf[1] = (l & 0x0000ff00) >> 8;
-            buf[2] = (l & 0x00ff0000) >> 16;
-            buf[3] = (l & 0xff000000) >> 24;
+            buf[0] =  (char)(l & 0x000000ff);
+            buf[1] = (char)((l & 0x0000ff00) >> 8);
+            buf[2] = (char)((l & 0x00ff0000) >> 16);
+            buf[3] = (char)((l & 0xff000000) >> 24);
         }
         else {
-            buf[0] = (l & 0xff000000) >> 24;
-            buf[1] = (l & 0x00ff0000) >> 16;
-            buf[2] = (l & 0x0000ff00) >> 8;
-            buf[3] =  l & 0x000000ff;
+            buf[0] = (char)((l & 0xff000000) >> 24);
+            buf[1] = (char)((l & 0x00ff0000) >> 16);
+            buf[2] = (char)((l & 0x0000ff00) >> 8);
+            buf[3] =  (char)(l & 0x000000ff);
         }
         return 4;
     }
@@ -175,12 +175,12 @@ namespace Exiv2 {
     long s2Data(char* buf, int16 s, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
-            buf[0] =  s & 0x00ff;
-            buf[1] = (s & 0xff00) >> 8;
+            buf[0] =  (char)(s & 0x00ff);
+            buf[1] = (char)((s & 0xff00) >> 8);
         }
         else {
-            buf[0] = (s & 0xff00) >> 8;
-            buf[1] =  s & 0x00ff;
+            buf[0] = (char)((s & 0xff00) >> 8);
+            buf[1] =  (char)(s & 0x00ff);
         }
         return 2;
     }
@@ -188,16 +188,16 @@ namespace Exiv2 {
     long l2Data(char* buf, int32 l, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
-            buf[0] =  l & 0x000000ff;
-            buf[1] = (l & 0x0000ff00) >> 8;
-            buf[2] = (l & 0x00ff0000) >> 16;
-            buf[3] = (l & 0xff000000) >> 24;
+            buf[0] =  (char)(l & 0x000000ff);
+            buf[1] = (char)((l & 0x0000ff00) >> 8);
+            buf[2] = (char)((l & 0x00ff0000) >> 16);
+            buf[3] = (char)((l & 0xff000000) >> 24);
         }
         else {
-            buf[0] = (l & 0xff000000) >> 24;
-            buf[1] = (l & 0x00ff0000) >> 16;
-            buf[2] = (l & 0x0000ff00) >> 8;
-            buf[3] =  l & 0x000000ff;
+            buf[0] = (char)((l & 0xff000000) >> 24);
+            buf[1] = (char)((l & 0x00ff0000) >> 16);
+            buf[2] = (char)((l & 0x0000ff00) >> 8);
+            buf[3] =  (char)(l & 0x000000ff);
         }
         return 4;
     }

-- 
exiv2 packaging