From bb51bdad0efa2f707f80f70bd8795863ebcb69db Mon Sep 17 00:00:00 2001 From: HumanDynamo Date: Thu, 22 Jul 2010 08:27:05 +0000 Subject: [PATCH] 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 e6e41b06..6361e506 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 );