drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 22 ++++++++-------- drawinglayer/source/tools/emfphelperdata.cxx | 2 + emfio/source/reader/emfreader.cxx | 4 -- 3 files changed, 15 insertions(+), 13 deletions(-)
New commits: commit 7f754805c094b1c5e6ae64da2e61f11c9628c7f4 Author: Armin Le Grand <[email protected]> Date: Fri Jun 23 14:02:38 2017 +0200 emfplus: more corrections due to linux build Change-Id: Ib2c3bff23043638d315405b5a91b2596e92f7ffa diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 842240bf317d..df33811a78d7 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -882,16 +882,18 @@ namespace drawinglayer { primitive2d::Primitive2DContainer aDecomposition; rMetafilePrimitive.get2DDecomposition(aDecomposition, getViewInformation2D()); - const primitive2d::ModifiedColorPrimitive2D aPrimitiveR( - aDecomposition, - basegfx::BColorModifierSharedPtr( - new basegfx::BColorModifier_RGBLuminanceContrast( - 0.5, // red - -0.5, // green - -0.5, // blue - 0.0, // luminance - 0.0))); // contrast - processBasePrimitive2D(aPrimitiveR); + primitive2d::BasePrimitive2D* pBasePrimitive = nullptr; + const primitive2d::Primitive2DReference aPrimitiveR( + pBasePrimitive = new primitive2d::ModifiedColorPrimitive2D( + aDecomposition, + basegfx::BColorModifierSharedPtr( + new basegfx::BColorModifier_RGBLuminanceContrast( + 0.5, // red + -0.5, // green + -0.5, // blue + 0.0, // luminance + 0.0)))); // contrast + processBasePrimitive2D(*pBasePrimitive); RenderMetafilePrimitive2D(rMetafilePrimitive); } else diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index 0f81783dec5d..b2eb9bac137d 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -1249,6 +1249,8 @@ namespace emfplushelper ", " << transform.get(0,2) << ", " << transform.get(1,2)); } + (void)(text); // avoid warning + // rendering::FontRequest aFontRequest; // // add the text action // setFont(aFontRequest, flags & 0xff, rFactoryParms, rState); diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index d6d056936d99..243b84fb7395 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -18,16 +18,14 @@ */ #include <emfreader.hxx> - #include <osl/endian.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/dibtools.hxx> #include <o3tl/make_unique.hxx> - +#include <tools/stream.hxx> #include <memory> #ifdef DBG_UTIL -#include <tools/stream.hxx> #include <vcl/pngwrite.hxx> #endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
