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

INTEGRATION: CWS presfixes03 (1.5.2); FILE MERGED

Browse Source 
2005/04/01 16:09:46 thb 1.5.2.1: #i36190#, #i39245# Changed uno::Sequence::operator[] for nonconst sequences to use naked ptr; added support for true bezier polygons (and removed subdivision, where it was added because of that canvas deficiency); overhauled mtf renderer to provide faithful bounds also for subsetted meta files
This commit is contained in:
Oliver Bolte
2005-04-18 09:01:43 +00:00
parent b6e7f1c224
commit 3725df2b06
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cppcanvas/source/wrapper/implbitmap.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implbitmap.cxx,v $ * $RCSfile: implbitmap.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2005-03-30 08:33:06 $ * last change: $Author: obo $ $Date: 2005-04-18 10:01:29 $
* *
* 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
@@ -66,6 +66,8 @@
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#endif #endif
#include <canvas/canvastools.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -132,11 +134,8 @@ namespace cppcanvas
} }
rendering::RenderState aLocalState( maRenderState ); rendering::RenderState aLocalState( maRenderState );
aLocalState.DeviceColor.realloc( 4 ); ::canvas::tools::setDeviceColor( aLocalState,
aLocalState.DeviceColor[0] = 1.0; 1.0, 1.0, 1.0, nAlphaModulation );
aLocalState.DeviceColor[1] = 1.0;
aLocalState.DeviceColor[2] = 1.0;
aLocalState.DeviceColor[3] = nAlphaModulation;
// TODO(P1): implement caching // TODO(P1): implement caching
pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap,

7
cppcanvas/source/wrapper/vclfactory.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: vclfactory.cxx,v $ * $RCSfile: vclfactory.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2005-03-30 08:35:49 $ * last change: $Author: obo $ $Date: 2005-04-18 10:01:43 $
* *
* 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
@@ -344,6 +344,7 @@ namespace cppcanvas
const USHORT nBitmaps( rAnim.Count() ); const USHORT nBitmaps( rAnim.Count() );
uno::Sequence< uno::Reference< rendering::XBitmap > > aBitmapSequence( nBitmaps ); uno::Sequence< uno::Reference< rendering::XBitmap > > aBitmapSequence( nBitmaps );
uno::Reference< rendering::XBitmap >* pBitmaps = aBitmapSequence.getArray();
unsigned int i; unsigned int i;
BitmapEx aBmpEx; BitmapEx aBmpEx;
@@ -391,7 +392,7 @@ namespace cppcanvas
if( rAnimBmp.eDisposal == DISPOSE_NOT ) if( rAnimBmp.eDisposal == DISPOSE_NOT )
aRestoreBuffer = aBmpEx; aRestoreBuffer = aBmpEx;
aBitmapSequence[i] = ::vcl::unotools::xBitmapFromBitmapEx( pBitmaps[i] = ::vcl::unotools::xBitmapFromBitmapEx(
xCanvas->getDevice(), xCanvas->getDevice(),
aBmpEx); aBmpEx);
} }