From 437d5d30422014c0a6def06e432a41e3f2e5c4c5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 31 Aug 2018 16:49:22 +0200 Subject: move identity checks into B3DHomMatrix::operator*= and consequently simplify some call-sites Change-Id: I301fc4c88fdfb8af75a348a41593a27f4c6567c5 Reviewed-on: https://gerrit.libreoffice.org/59916 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../source/primitive2d/svggradientprimitive2d.cxx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 12eef36c16ac..6e2ab2e16b3e 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -404,14 +404,11 @@ namespace drawinglayer aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX())); aUnitGradientToObject.translate(getStart().getX(), getStart().getY()); - if(!getGradientTransform().isIdentity()) - { - aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject; - } + aUnitGradientToObject *= getGradientTransform(); // create full transform from unit gradient coordinates to object coordinates // including the SvgGradient transformation - aUnitGradientToObject = aObjectTransform * aUnitGradientToObject; + aUnitGradientToObject *= aObjectTransform; } else { @@ -424,10 +421,7 @@ namespace drawinglayer aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX())); aUnitGradientToObject.translate(aStart.getX(), aStart.getY()); - if(!getGradientTransform().isIdentity()) - { - aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject; - } + aUnitGradientToObject *= getGradientTransform(); } // create inverse from it @@ -757,10 +751,7 @@ namespace drawinglayer aUnitGradientToObject.scale(fRadius, fRadius); aUnitGradientToObject.translate(aStart.getX(), aStart.getY()); - if(!getGradientTransform().isIdentity()) - { - aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject; - } + aUnitGradientToObject *= getGradientTransform(); } // create inverse from it -- cgit