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

INTEGRATION: CWS canvas05 (1.9.38); FILE MERGED

Browse Source 
2008/04/21 07:50:45 thb 1.9.38.2: RESYNC: (1.9-1.10); FILE MERGED
2007/10/01 13:41:45 thb 1.9.38.1: #i79258# Merge from CWS picom
This commit is contained in:
Kurt Zenker
2008-06-24 10:50:40 +00:00
parent ddb12feee4
commit 6cd6053560
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: implbitmap.cxx,v $ * $RCSfile: implbitmap.cxx,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -31,10 +31,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppcanvas.hxx" #include "precompiled_cppcanvas.hxx"
#include <implbitmap.hxx> #include "implbitmap.hxx"
#include <implbitmapcanvas.hxx> #include "implbitmapcanvas.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <canvas/canvastools.hxx> #include <canvas/canvastools.hxx>
@@ -103,8 +103,10 @@ namespace cppcanvas
} }
rendering::RenderState aLocalState( getRenderState() ); rendering::RenderState aLocalState( getRenderState() );
::canvas::tools::setDeviceColor( aLocalState, uno::Sequence<rendering::ARGBColor> aCol(1);
1.0, 1.0, 1.0, nAlphaModulation ); aCol[0] = rendering::ARGBColor( nAlphaModulation, 1.0, 1.0, 1.0 );
aLocalState.DeviceColor =
pCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(aCol);
// TODO(P1): implement caching // TODO(P1): implement caching
pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap,