Kaydet (Commit) 9957d585 authored tarafından Armin Le Grand's avatar Armin Le Grand

i12355 Corrected case that in WinSalGraphics::setClipRegion an empty Polygon is handed over

üst 342ebf4c
......@@ -1017,13 +1017,19 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
}
// create clip region from ClipRgnData
if ( mpClipRgnData->rdh.nCount == 1 )
if(0 == mpClipRgnData->rdh.nCount)
{
// #123585# region is empty; this may happen when e.g. a PolyPolygon is given
// that contains no polygons or only empty ones (no width/height). This is
// perfectly fine and we are done, except setting it (see end of method)
}
else if(1 == mpClipRgnData->rdh.nCount)
{
RECT* pRect = &(mpClipRgnData->rdh.rcBound);
mhRegion = CreateRectRgn( pRect->left, pRect->top,
pRect->right, pRect->bottom );
}
else if( mpClipRgnData->rdh.nCount > 1 )
else if(mpClipRgnData->rdh.nCount > 1)
{
ULONG nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER);
mhRegion = ExtCreateRegion( NULL, nSize, mpClipRgnData );
......@@ -1063,8 +1069,14 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
//
//bool bBla = true;
}
else
{
// #123585# See above, this is a valid case, execute it
SelectClipRgn( getHDC(), 0 );
}
return mhRegion != 0;
// #123585# retval no longer dependent of mhRegion, see TaskId comments above
return true;
}
// -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment