summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-02-15 17:30:45 +0100
committerRadek Doulik <rodo@novell.com>2011-02-15 17:30:45 +0100
commit220ca4436d36d4ef4b40b13f38c3863603bbae2d (patch)
treec7d8219bd50e173965a4434a15f00481482907f6
parent27119e72dd2ee8125492957aebaa18521327c587 (diff)
restrict metafile decomposition (fixes n#650049)
- do not use metafile decomposition on metafiles which need canvas renderer (right now, these containing EMF+)
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index dfa39831a0..ff8d3f8f70 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -229,8 +229,10 @@ namespace drawinglayer
mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE);
}
+ const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) );
+
static bool bTestMetaFilePrimitiveDecomposition(true);
- if(bTestMetaFilePrimitiveDecomposition)
+ if( bTestMetaFilePrimitiveDecomposition && !rMetafilePrimitive.getMetaFile().GetUseCanvas() )
{
// use new Metafile decomposition
process(rCandidate.get2DDecomposition(getViewInformation2D()));
@@ -238,7 +240,7 @@ namespace drawinglayer
else
{
// direct draw of MetaFile
- RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate));
+ RenderMetafilePrimitive2D( rMetafilePrimitive );
}
if(bForceLineSnap)