You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/08/13 18:13:32 UTC
svn commit: r1372492 -
/incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
Author: alg
Date: Mon Aug 13 16:13:31 2012
New Revision: 1372492
URL: http://svn.apache.org/viewvc?rev=1372492&view=rev
Log:
Corrected small signed/unsigned mismatch
Modified:
incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
Modified: incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx?rev=1372492&r1=1372491&r2=1372492&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx Mon Aug 13 16:13:31 2012
@@ -874,8 +874,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
// test if it is sensible to crop
if ( ( cxSrc > 0 ) && ( cySrc > 0 ) &&
( xSrc >= 0 ) && ( ySrc >= 0 ) &&
- ( xSrc + cxSrc <= static_cast< sal_Int32 >(aBitmap.GetSizePixel().Width()) ) &&
- ( ySrc + cySrc <= static_cast< sal_Int32 >(aBitmap.GetSizePixel().Height()) ) )
+ ( xSrc + static_cast< sal_Int32 >(cxSrc) <= static_cast< sal_Int32 >(aBitmap.GetSizePixel().Width()) ) &&
+ ( ySrc + static_cast< sal_Int32 >(cySrc) <= static_cast< sal_Int32 >(aBitmap.GetSizePixel().Height()) ) )
{
Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );