[Libreoffice-commits] core.git: canvas/inc canvas/Library_vclcanvas.mk canvas/source

[Luboš Luňák (via logerrit)]

 canvas/Library_vclcanvas.mk              |    5 +----
 canvas/inc/pch/precompiled_vclcanvas.hxx |    6 +++---
 canvas/source/vcl/spritehelper.cxx       |   10 +---------
 3 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit b5704e5431c6662b8b39f6458ec08a906efe1705
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Dec 1 11:30:46 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri Dec 4 10:55:27 2020 +0100

    Revert "tdf#118107 canvas opengl: avoid assertion failure with negative widths"
    
    I fixed the assert with 4eb816de71f1310a3a5d9803f7355849e6273439 (and
    follow-up commits), so this is no longer needed.
    
    This reverts commit 76b43425d764fbc9bf4dac52054b1d94344f26b0.
    
    Change-Id: I85dec14cc8858b7168532661de9ca77c31802a62
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106962
    Tested-by: Luboš Luňák <l.lunak at collabora.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 8c5f31484d56..5192857d87b5 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -28,10 +28,7 @@ $(eval $(call gb_Library_set_precompiled_header,vclcanvas,canvas/inc/pch/precomp
 
 $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
 
-$(eval $(call gb_Library_use_externals,vclcanvas,\
-	boost_headers \
-	epoxy \
-))
+$(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
diff --git a/canvas/inc/pch/precompiled_vclcanvas.hxx b/canvas/inc/pch/precompiled_vclcanvas.hxx
index cdad07862596..b31a1cd02792 100644
--- a/canvas/inc/pch/precompiled_vclcanvas.hxx
+++ b/canvas/inc/pch/precompiled_vclcanvas.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-10-02 11:01:53 using:
+ Generated on 2020-12-01 16:34:48 using:
  ./bin/update_pch canvas vclcanvas --cutoff=1 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -39,8 +39,8 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
+#include <vcl/gradient.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <vcl/svapp.hxx>
@@ -54,7 +54,6 @@
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/utils/canvastools.hxx>
@@ -81,6 +80,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/long.hxx>
 #include <tools/poly.hxx>
 #include <tools/stream.hxx>
 #endif // PCH_LEVEL >= 3
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 96300101b5ae..53116fa9d53d 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -32,7 +32,6 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/BitmapMonochromeFilter.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 
 #include <canvas/canvastools.hxx>
@@ -189,15 +188,8 @@ namespace vclcanvas
 
         if( !bIdentityTransform )
         {
-            // Avoid the trick with the negative width in the OpenGL case,
-            // OutputDevice::DrawDeviceAlphaBitmap() doesn't like it.
             if (!::basegfx::fTools::equalZero( aTransform.get(0,1) ) ||
-                !::basegfx::fTools::equalZero( aTransform.get(1,0) )
-#if HAVE_FEATURE_UI
-                || OpenGLHelper::isVCLOpenGLEnabled()
-#endif
-                || SkiaHelper::isVCLSkiaEnabled()
-               )
+                !::basegfx::fTools::equalZero( aTransform.get(1,0) ))
             {
                 // "complex" transformation, employ affine
                 // transformator