[Libreoffice-commits] core.git: vcl/source

Chris Sherlock chris.sherlock79 at gmail.com
Tue Mar 25 05:26:41 PDT 2014


 vcl/source/gdi/outdev2.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 514d33fa3a409681be93bed3fb33f940a5549d88
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Mar 23 20:26:09 2014 +1100

    fdo#74702 DrawTransformedBitmapEx simplified
    
    Removed bPrinter check from DrawTransformedBitmapEx, also removes
    meOutDevType.
    
    Change-Id: I5fd09efc4f3467702ab9671dc45da1a9c0e3f927
    Reviewed-on: https://gerrit.libreoffice.org/8723
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 29f1702..4d2c764 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -798,7 +798,6 @@ void OutputDevice::DrawTransformedBitmapEx(
     const bool bInvert(ROP_INVERT == meRasterOp);
     const bool bBitmapChangedColor(mnDrawMode & (DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP | DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP));
     const bool bMetafile(mpMetaFile);
-    const bool bPrinter(OUTDEV_PRINTER == meOutDevType);
     bool bDone(false);
     const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
     const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile );
@@ -835,7 +834,7 @@ void OutputDevice::DrawTransformedBitmapEx(
         const double fOrigAreaScaled(bSheared || bRotated ? fOrigArea * 1.44 : fOrigArea);
         double fMaximumArea(std::min(4500000.0, std::max(1000000.0, fOrigAreaScaled)));
 
-        if(!bMetafile && !bPrinter)
+        if(!bMetafile)
         {
             if ( !TransformReduceBitmapExTargetRange( aFullTransform, aVisibleRange, fMaximumArea ) )
                 return;


More information about the Libreoffice-commits mailing list