strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS canvas05 (1.4.24); FILE MERGED

Browse source 
2008/04/21 07:32:07 thb 1.4.24.4: RESYNC: (1.4-1.5); FILE MERGED
2008/04/02 22:56:26 thb 1.4.24.3: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII
2007/12/20 22:18:56 thb 1.4.24.2: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
2007/10/01 13:02:01 thb 1.4.24.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
This commit is contained in:
Kurt Zenker 2008-06-24 09:17:39 +00:00
parent ee95f7f4b8
commit 5d87d3fa76
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
canvas/source/cairo/cairo_cachedbitmap.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cairo_cachedbitmap.cxx,v $
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
*
@ -32,6 +32,7 @@
#include "precompiled_canvas.hxx"
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include "cairo_cachedbitmap.hxx"
#include "cairo_repainttarget.hxx"
@ -48,26 +49,20 @@ using namespace ::com::sun::star;
namespace cairocanvas
{
CachedBitmap::CachedBitmap( Surface* pSurface,
CachedBitmap::CachedBitmap( const SurfaceSharedPtr& pSurface,
const rendering::ViewState& rUsedViewState,
const rendering::RenderState& rUsedRenderState,
const rendering::RenderState& rUsedRenderState,
const uno::Reference< rendering::XCanvas >& rTarget ) :
CachedPrimitiveBase( rUsedViewState, rTarget, true ),
mpSurface( pSurface ),
maRenderState( rUsedRenderState )
{
mpSurface->Ref();
}
mpSurface( pSurface ),
maRenderState( rUsedRenderState )
{}
void SAL_CALL CachedBitmap::disposing()
{
::osl::MutexGuard aGuard( m_aMutex );
if( mpSurface ) {
mpSurface->Unref();
mpSurface = NULL;
}
mpSurface.reset();
CachedPrimitiveBase::disposing();
}
@ -76,13 +71,13 @@ namespace cairocanvas
const uno::Reference< rendering::XCanvas >& rTargetCanvas,
bool bSameViewTransform )
{
ENSURE_AND_THROW( bSameViewTransform,
ENSURE_OR_THROW( bSameViewTransform,
"CachedBitmap::doRedraw(): base called with changed view transform "
"(told otherwise during construction)" );
RepaintTarget* pTarget = dynamic_cast< RepaintTarget* >(rTargetCanvas.get());
ENSURE_AND_THROW( pTarget,
ENSURE_OR_THROW( pTarget,
"CachedBitmap::redraw(): cannot cast target to RepaintTarget" );
if( !pTarget->repaint( mpSurface,