diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-01 11:30:46 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-04 10:55:27 +0100 |
| commit | b5704e5431c6662b8b39f6458ec08a906efe1705 (patch) | |
| tree | da0b552b0de804c1a5db8fa36b192c3e526b5f21 /canvas/source | |
| parent | daf2a7d957c829c551754871a3545495c0f76bc0 (diff) | |
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@collabora.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
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 |