[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=61eb48c

The following commit has been merged in the master branch:
commit 61eb48cb354f67ebe19995f7a9bd56eaa9ef684f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Nov 26 13:04:04 2006 +0000

    Changed uint to unsigned int because MINGW does not define uint. Fixes bug #490
---
 src/pngchunk.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 21fec43..a18e90a 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -123,7 +123,7 @@ namespace Exiv2 {
 
                     // compressed string after the compression technique spec
                     const byte* compressedText = &PNG_CHUNK_DATA(pData, index, keysize+2);
-                    uint compressedTextSize    = getLong(&pData[index], bigEndian)-keysize-2;
+                    unsigned int compressedTextSize = getLong(&pData[index], bigEndian)-keysize-2;
 
                     // security check, also considering overflow wraparound from the addition --
                     // we may endup with a /smaller/ index if we wrap all the way around
@@ -266,7 +266,7 @@ namespace Exiv2 {
         register long           i;
         register unsigned char *dp;
         const char             *sp;
-        uint                    nibbles;
+        unsigned int            nibbles;
         long                    length;
         unsigned char           unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
                                             0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,

-- 
exiv2 packaging