Avoid division by zeros (Fixes #946)

ChartsOrg · Apr 13, 2016 · f7cf599 · f7cf599
1 parent c5896b6
commit f7cf599
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/Charts/Classes/Utils/ChartViewPortHandler.swift b/Charts/Classes/Utils/ChartViewPortHandler.swift
@@ -316,7 +316,14 @@ public class ChartViewPortHandler: NSObject
     /// Sets the maximum scale factor for the x-axis
     public func setMaximumScaleX(xScale: CGFloat)
     {
-        _maxScaleX = xScale
+        var newValue = xScale
+
+        if (newValue == 0.0)
+        {
+            newValue = CGFloat.max
+        }
+
+        _maxScaleX = newValue
 
         limitTransAndScale(matrix: &_touchMatrix, content: _contentRect)
     }
@@ -325,11 +332,16 @@ public class ChartViewPortHandler: NSObject
     public func setMinMaxScaleX(minScaleX minScaleX: CGFloat, maxScaleX: CGFloat)
     {
         var newMin = minScaleX
+        var newMax = minScaleY
 
         if (newMin < 1.0)
         {
             newMin = 1.0
         }
+        if (newMax == 0.0)
+        {
+            newMax = CGFloat.max
+        }
 
         _minScaleX = newMin
         _maxScaleX = maxScaleX
@@ -355,7 +367,14 @@ public class ChartViewPortHandler: NSObject
     /// Sets the maximum scale factor for the y-axis
     public func setMaximumScaleY(yScale: CGFloat)
     {
-        _maxScaleY = yScale
+        var newValue = yScale
+
+        if (newValue == 0.0)
+        {
+            newValue = CGFloat.max
+        }
+
+        _maxScaleY = newValue
 
         limitTransAndScale(matrix: &_touchMatrix, content: _contentRect)
     }