diff options
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 519f975a0f12..796b3b82f555 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -1261,28 +1261,6 @@ void OutputDevice::DrawTransformedBitmapEx( : nullptr); #endif - // MM02 reorganize order: Prefer DrawTransformBitmapExDirect due - // to this having evolved and is improved on quite some systems. - // Check for exclusion parameters that may prevent using it - static bool bAllowPreferDirectPaint(true); - const bool bInvert(RasterOp::Invert == meRasterOp); - const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap )); - const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile); - - if(bAllowPreferDirectPaint && bTryDirectPaint) - { - // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may - // be that mnOutOffX/mnOutOffY is used - see AOO bug 75163, mentioned at - // ImplGetDeviceTransformation declaration - const basegfx::B2DHomMatrix aFullTransform(ImplGetDeviceTransformation() * rTransformation); - - if(DrawTransformBitmapExDirect(aFullTransform, rBitmapEx)) - { - // we are done - return; - } - } - // decompose matrix to check rotation and shear basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; @@ -1317,8 +1295,9 @@ void OutputDevice::DrawTransformedBitmapEx( return; } - // MM02 bAllowPreferDirectPaint may have been false to allow - // to specify order of executions, so give bTryDirectPaint a call + const bool bInvert(RasterOp::Invert == meRasterOp); + const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap )); + const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile); if(bTryDirectPaint) { // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may |