From d3dde5d940d69d6b859fef3ff722e349d7d89c54 Mon Sep 17 00:00:00 2001
From: Regina Henschel <regina@apache.org>
Date: Fri, 7 Sep 2012 12:33:04 +0000
Subject: Resolves: #i120642# expand target to maximum edge not to diagonal

(cherry picked from commit 2e1700bf4f7cf913c23d35f325a50d3aa25426cc)

Change-Id: Ic27fb3b18f42667419765a6adca41e1df27561c2
---
 basegfx/source/tools/gradienttools.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'basegfx')

diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
index c45c335e9368..9587872f8995 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -193,11 +193,11 @@ namespace basegfx
         // add object expansion
         if(bSquare)
         {
-            const double fOriginalDiag(sqrt((fTargetSizeX * fTargetSizeX) + (fTargetSizeY * fTargetSizeY)));
-            fTargetOffsetX -= (fOriginalDiag - fTargetSizeX) / 2.0;
-            fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
-            fTargetSizeX = fOriginalDiag;
-            fTargetSizeY = fOriginalDiag;
+            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;
         }
 
         // add object expansion
-- 
cgit v1.2.3