diff options
author | Radek Doulik <rodo@novell.com> | 2011-02-09 16:04:29 +0100 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2011-02-09 16:06:55 +0100 |
commit | 229df81b920ddee5a1b057af75db7b293f88e3bd (patch) | |
tree | 7af3feda33eea6c3c1da778688fc65b47c81f7d7 /drawinglayer | |
parent | fa7bd86864051bfd2b9554ed8fecdd7d59e0cf84 (diff) |
restrict metafile decomposition (fixes n#650049)
- do not use metafile decomposition on metafiles which need
canvas renderer (right now, these containing EMF+)
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index dfa39831a0..ca594c0e25 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -229,7 +229,9 @@ namespace drawinglayer mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE); } - static bool bTestMetaFilePrimitiveDecomposition(true); + const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) ); + + static bool bTestMetaFilePrimitiveDecomposition( !rMetafilePrimitive.getMetaFile().GetUseCanvas() ); if(bTestMetaFilePrimitiveDecomposition) { // use new Metafile decomposition @@ -238,7 +240,7 @@ namespace drawinglayer else { // direct draw of MetaFile - RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); + RenderMetafilePrimitive2D( rMetafilePrimitive ); } if(bForceLineSnap) |