summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-06-01 13:30:59 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-06 08:31:15 +0000
commit6bac502897585a32c9ad9256c344499d73f7d5ba (patch)
treec62811632c95fa7a05dfbb9cbe45a377b9238a19
parentfb433b7909d049f12e848ad56ae8b406f91e1cc2 (diff)
tdf#95581: Assume tiny shears are rounding artefacts etc and can be ignored
See bug report for more discussion. Change-Id: I50ee82abac4ddfbdca0fb03d17c0518860466a52 Reviewed-on: https://gerrit.libreoffice.org/25767 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index fda9de556598..45a92aeec6ba 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <cmath>
#include <comphelper/string.hxx>
#include "vclprocessor2d.hxx"
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
@@ -123,7 +124,9 @@ namespace drawinglayer
aLocalTransform.decompose(aFontScaling, aTranslate, fRotate, fShearX);
bool bPrimitiveAccepted(false);
- if(basegfx::fTools::equalZero(fShearX))
+ // tdf#95581: Assume tiny shears are rounding artefacts or whatever and can be ignored,
+ // especially if the effect is less than a pixel.
+ if(std::abs(aFontScaling.getY() * fShearX) < 1)
{
if(basegfx::fTools::less(aFontScaling.getX(), 0.0) && basegfx::fTools::less(aFontScaling.getY(), 0.0))
{