mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS swqbugfixes15 (1.17.52); FILE MERGED

Browse Source 
2005/02/15 08:41:23 od 1.17.52.1: #i42643# <GraphicObject::ImplDrawTiled(..)> - avoid overflow
This commit is contained in:
Vladimir Glazounov
2005-03-08 12:38:48 +00:00
parent bd2690e404
commit 20b478ff18
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
goodies/source/graphic/grfmgr2.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: grfmgr2.cxx,v $ * $RCSfile: grfmgr2.cxx,v $
* *
* $Revision: 1.17 $ * $Revision: 1.18 $
* *
* last change: $Author: kz $ $Date: 2004-06-11 09:49:31 $ * last change: $Author: vg $ $Date: 2005-03-08 13:38:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1869,8 +1869,11 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c
const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
bool bRet( false ); bool bRet( false );
// #i42643# Casting to Int64, to avoid integer overflow for
// huge-DPI output devices
if( GetGraphic().GetType() == GRAPHIC_BITMAP && if( GetGraphic().GetType() == GRAPHIC_BITMAP &&
rSizePixel.Width() * rSizePixel.Height() < nTileCacheSize1D*nTileCacheSize1D ) static_cast<sal_Int64>(rSizePixel.Width()) * rSizePixel.Height() <
static_cast<sal_Int64>(nTileCacheSize1D)*nTileCacheSize1D )
{ {
// First combine very small bitmaps into a larger tile // First combine very small bitmaps into a larger tile
// =================================================== // ===================================================
@@ -1879,7 +1882,8 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c
const int nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() ); const int nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() );
const int nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() ); const int nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() );
aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(), nNumTilesInCacheY*rSizePixel.Height() ) ); aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(),
nNumTilesInCacheY*rSizePixel.Height() ) );
aVDev.SetMapMode( aMapMode ); aVDev.SetMapMode( aMapMode );
// draw bitmap content // draw bitmap content