From 549d5631f51d2f3948c7321d1e30e89688a50664 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sat, 23 Aug 2014 07:56:55 +0200
Subject: Fix skewing bug that could lead to infinite transforms

Fixed bugs:
  - https://launchpad.net/bugs/1266499

(bzr r13530)
---
 src/seltrans.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/seltrans.cpp')

diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 6b8cd19bb..e15249f94 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -9,7 +9,7 @@
  *   Abhishek Sharma
  *
  * Copyright (C) 1999-2002 Lauris Kaplinski
- * Copyright (C) 1999-2008 Authors
+ * Copyright (C) 1999-2014 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -1109,10 +1109,17 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, Geom::P
             break;
     }
 
+    // _point and _origin are noisy, ranging from 1 to 1e-9 or even smaller; this is due to the
+    // limited SVG output precision, which can be arbitrarily set in the preferences
     Geom::Point const initial_delta = _point - _origin;
 
-    if (fabs(initial_delta[dim_a]) < 1e-15) {
-        return false;
+    // The handle and the origin shouldn't be too close to each other; let's check for that!
+    // Due to the limited resolution though (see above), we'd better use a relative error here
+    if (_bbox) {
+        Geom::Coord d = (*_bbox).dimensions()[dim_a];
+        if (fabs(initial_delta[dim_a]/d) < 1e-4) {
+            return false;
+        }
     }
 
     // Calculate the scale factors, which can be either visual or geometric
-- 
cgit v1.2.3