Kaydet (Commit) 514d33fa authored tarafından Chris Sherlock's avatar Chris Sherlock

fdo#74702 DrawTransformedBitmapEx simplified

Removed bPrinter check from DrawTransformedBitmapEx, also removes
meOutDevType.

Change-Id: I5fd09efc4f3467702ab9671dc45da1a9c0e3f927
Reviewed-on: https://gerrit.libreoffice.org/8723Reviewed-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
Tested-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
üst 03568b2e
...@@ -798,7 +798,6 @@ void OutputDevice::DrawTransformedBitmapEx( ...@@ -798,7 +798,6 @@ void OutputDevice::DrawTransformedBitmapEx(
const bool bInvert(ROP_INVERT == meRasterOp); const bool bInvert(ROP_INVERT == meRasterOp);
const bool bBitmapChangedColor(mnDrawMode & (DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP | DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP)); const bool bBitmapChangedColor(mnDrawMode & (DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP | DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP));
const bool bMetafile(mpMetaFile); const bool bMetafile(mpMetaFile);
const bool bPrinter(OUTDEV_PRINTER == meOutDevType);
bool bDone(false); bool bDone(false);
const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation); const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile ); const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile );
...@@ -835,7 +834,7 @@ void OutputDevice::DrawTransformedBitmapEx( ...@@ -835,7 +834,7 @@ void OutputDevice::DrawTransformedBitmapEx(
const double fOrigAreaScaled(bSheared || bRotated ? fOrigArea * 1.44 : fOrigArea); const double fOrigAreaScaled(bSheared || bRotated ? fOrigArea * 1.44 : fOrigArea);
double fMaximumArea(std::min(4500000.0, std::max(1000000.0, fOrigAreaScaled))); double fMaximumArea(std::min(4500000.0, std::max(1000000.0, fOrigAreaScaled)));
if(!bMetafile && !bPrinter) if(!bMetafile)
{ {
if ( !TransformReduceBitmapExTargetRange( aFullTransform, aVisibleRange, fMaximumArea ) ) if ( !TransformReduceBitmapExTargetRange( aFullTransform, aVisibleRange, fMaximumArea ) )
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment