[Libreoffice-commits] .: vcl/source

Mon Oct 22 02:32:08 PDT 2012

vcl/source/gdi/impgraph.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dedff8f84ce19949da03c02bb7b41bc62d2789af
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 22 11:31:38 2012 +0200

    -Werror,-Wtautological-constant-out-of-range-compare
    
    Change-Id: I320c11d4b3d295c65dcd966f70a2de4f05926ebb

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 333fb3f..13e651a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1127,7 +1127,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
             rIStm >> *this;
             bRet = ( rIStm.GetError() == 0UL );
         }
-        else if( meType >= SYS_WINMETAFILE && meType <= SYS_MACMETAFILE )
+        else if( sal::static_int_cast<sal_uLong>(meType) >= SYS_WINMETAFILE
+                 && sal::static_int_cast<sal_uLong>(meType) <= SYS_MACMETAFILE )
         {
             Graphic aSysGraphic;
             sal_uLong   nCvtType;
