INTEGRATION: CWS presfixes03 (1.2.2); FILE MERGED

2005/04/01 15:48:08 thb 1.2.2.1: #i36190#, #i37793#, #i39245#, #i46023# Fixes for open/close polygon stroking; beefed up the canvas tools; moved try/catch block around configuration in cf_factory (to facilitate canvasdemo with broken/incomplete services.rdb; enhanced TextLayout to cope with new Action::getBounds() functionality in cppcanvas (needed for proper mtf bounds calculation); removed extra pixel right and bottom for filled polygons; avoiding uno::Sequence::operator[] for non-const cases, but using the naked mem ptr instead (performance)
This commit is contained in:
Oliver Bolte
2005-04-18 08:11:12 +00:00
parent 449a02c52f
commit c9706acf97

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: canvashelper_texturefill.cxx,v $ * $RCSfile: canvashelper_texturefill.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2005-03-30 07:37:12 $ * last change: $Author: obo $ $Date: 2005-04-18 09:11:12 $
* *
* 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
@@ -282,11 +282,8 @@ namespace vclcanvas
{ {
// setup alpha modulation values // setup alpha modulation values
rendering::RenderState aLocalState( renderState ); rendering::RenderState aLocalState( renderState );
aLocalState.DeviceColor.realloc( 4 ); ::canvas::tools::setDeviceColor( aLocalState,
aLocalState.DeviceColor[0] = 0.0; 0.0, 0.0, 0.0, textures[0].Alpha );
aLocalState.DeviceColor[1] = 0.0;
aLocalState.DeviceColor[2] = 0.0;
aLocalState.DeviceColor[3] = textures[0].Alpha;
return drawBitmapModulated( rCanvas, return drawBitmapModulated( rCanvas,
textures[0].Bitmap, textures[0].Bitmap,