From 38d02291f32d0f605a4046a96fd6c90abd935f6b Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 7 Sep 2012 12:52:40 +0000 Subject: Related: #120642# streamlined a little bit (cherry picked from commit d33d09be15d01ae74a9b895e6c17cba63f1f84ed) Change-Id: I2646e27a017a37a517d1f82b281fa59794b635db --- basegfx/source/tools/gradienttools.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'basegfx') diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx index 9587872f8995..7bdc07d1441c 100644 --- a/basegfx/source/tools/gradienttools.cxx +++ b/basegfx/source/tools/gradienttools.cxx @@ -193,11 +193,10 @@ namespace basegfx // add object expansion if(bSquare) { - const double fSquareWidth((fTargetSizeX>fTargetSizeY) ? fTargetSizeX : fTargetSizeY); - fTargetOffsetX = fTargetOffsetX + fTargetSizeX / 2.0 - fSquareWidth / 2.0; - fTargetOffsetY = fTargetOffsetY + fTargetSizeY / 2.0 - fSquareWidth / 2.0; - fTargetSizeX = fSquareWidth; - fTargetSizeY = fSquareWidth; + const double fSquareWidth(std::max(fTargetSizeX, fTargetSizeY)); + fTargetOffsetX -= (fSquareWidth - fTargetSizeX) / 2.0; + fTargetOffsetY -= (fSquareWidth - fTargetSizeY) / 2.0; + fTargetSizeX = fTargetSizeY = fSquareWidth; } // add object expansion -- cgit