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

check bitmap size before creating canvas action

Browse Source
This commit is contained in:
Radek Doulik
2011-08-10 20:49:51 +02:00
parent d0a69c9a1f
commit d7d976c257
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cppcanvas/source/mtfrenderer/emfplus.cxx
View File

@@ -1417,20 +1417,24 @@ namespace cppcanvas
aBmp.Crop( aCropRect );
ActionSharedPtr pBmpAction (
internal::BitmapActionFactory::createBitmapAction (
aBmp,
rState.mapModeTransform * Map (x1, y1),
rState.mapModeTransform * MapSize(x2 - x1, y3 - y1),
rCanvas,
rState));
Size aSize( aBmp.GetSizePixel() );
if( aSize.Width() > 0 && aSize.Height() > 0 ) {
ActionSharedPtr pBmpAction (
internal::BitmapActionFactory::createBitmapAction (
aBmp,
rState.mapModeTransform * Map (x1, y1),
rState.mapModeTransform * MapSize(x2 - x1, y3 - y1),
rCanvas,
rState));
if( pBmpAction ) {
maActions.push_back( MtfAction( pBmpAction,
rFactoryParms.mrCurrActionIndex ) );
if( pBmpAction ) {
maActions.push_back( MtfAction( pBmpAction,
rFactoryParms.mrCurrActionIndex ) );
rFactoryParms.mrCurrActionIndex += pBmpAction->getActionCount()-1;
}
rFactoryParms.mrCurrActionIndex += pBmpAction->getActionCount()-1;
}
} else
EMFP_DEBUG (printf ("EMF+ warning: empty bitmap\n"));
} else {
EMFP_DEBUG (printf ("EMF+ DrawImagePoints TODO (fixme)\n"));
}