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

The following commit has been merged in the master branch:
commit bb51bdad0efa2f707f80f70bd8795863ebcb69db
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Jul 22 08:27:05 2010 +0000

    fix 2 warnings generated by GCC 4.x under linux into Adobe XMP SDK:
    
    [ 20%] Building CXX object src/CMakeFiles/exiv2.dir/__/xmpsdk/src/XMPMeta.cpp.o
    /home/gilles/Documents/Devel/SVN/trunk/exiv2/xmpsdk/src/XMPMeta.cpp: In function 'XMP_Status DumpClearString(const XMP_VarString&, XMP_Status (*)(void*, const char*, XMP_StringLen), void*)':
    /home/gilles/Documents/Devel/SVN/trunk/exiv2/xmpsdk/src/XMPMeta.cpp:117: warning: comparison is always false due to limited range of data type
    /home/gilles/Documents/Devel/SVN/trunk/exiv2/xmpsdk/src/XMPMeta.cpp:127: warning: comparison is always true due to limited range of data type
---
 xmpsdk/src/XMPMeta.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index e6e41b0..6361e50 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -114,7 +114,7 @@ DumpClearString ( const XMP_VarString & value, XMP_TextOutputProc outProc, void
 	
 		// Output the next span of regular characters.
 		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
-			if ( *spanEnd > 0x7F ) break;
+			if ( (unsigned char)(*spanEnd) > 0x7F ) break;
 			if ( (*spanEnd < 0x20) && (*spanEnd != kTab) && (*spanEnd != kLF) ) break;
 		}
 		if ( spanStart != spanEnd ) status = (*outProc) ( refCon,  spanStart, (spanEnd-spanStart) );
@@ -124,7 +124,7 @@ DumpClearString ( const XMP_VarString & value, XMP_TextOutputProc outProc, void
 		// Output the next span of irregular characters.
 		prevNormal = true;
 		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
-			if ( ((0x20 <= *spanEnd) && (*spanEnd <= 0x7F)) || (*spanEnd == kTab) || (*spanEnd == kLF) ) break;
+			if ( ((0x20 <= *spanEnd) && ((unsigned char)(*spanEnd) <= 0x7F)) || (*spanEnd == kTab) || (*spanEnd == kLF) ) break;
 			char space = ' ';
 			if ( prevNormal ) space = '<';
 			status = (*outProc) ( refCon, &space, 1 );

-- 
exiv2 packaging