diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 15:05:36 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 16:59:41 +0000 |
commit | e2883ca86f747eb62d1fe9e9b8d115c689e3abd7 (patch) | |
tree | b73e0f5d5734440e4ce5f9df861d8cec5f1f2209 /include/vcl | |
parent | 7c2250cbd2fc392e11cb1fe70ff139457968e23a (diff) |
Resolves: fdo#82219 color graphics as black and white
i.e. revert
commit bb5c7d6a79309236d4f19bb2498f2e850f735a2f
Date: Sun Apr 13 01:42:27 2014 +1000
fdo#38844 Reduce XOR clipping for gradients
Removed XOR clipping version of ClipAndDrawGradientMetafile. Because it
has been removed, the other version isn't really needed in it's own
function so I've moved it back into DrawGradient.
Change-Id: Ib1519a019061c8c71183db63e5c11681bcad4cc4
Change-Id: Iff1cb48cb8fa6d29937cf228a57aea9e8072110c
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
-rw-r--r-- | include/vcl/print.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 23abb00c7023..0d363096086e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1511,6 +1511,8 @@ protected: virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly ); + virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const tools::PolyPolygon &rPolyPoly ); + private: SAL_DLLPRIVATE bool DrawTransparentNatively( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 3a9ad1d3c236..242873c95dd1 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -259,6 +259,7 @@ protected: virtual long GetGradientStepCount( long nMinRect ) SAL_OVERRIDE; virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE; + virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const tools::PolyPolygon &rPolyPoly ) SAL_OVERRIDE; void ScaleBitmap ( Bitmap&, SalTwoRect& ) SAL_OVERRIDE { }; |