- Fixed issue #10746: Border size reducement algorithm fails for polygones

  with edge lengths < reducement
  # Modifications in comparision files because some invisible small shapes 
  # were not rendered any more

2 files changed, 30 insertions, 4 deletions

diff --git a/src/driver/flash.php b/src/driver/flash.php
index 409b107..38c07a2 100644
--- a/src/driver/flash.php
+++ b/src/driver/flash.php
@@ -194,7 +194,14 @@ class ezcGraphFlashDriver extends ezcGraphDriver
         {
             // The middle of the border is on the outline of a polygon in ming, 
             // fix that:
-            $points = $this->reducePolygonSize( $points, $thickness / 2 );
+            try
+            {
+                $points = $this->reducePolygonSize( $points, $thickness / 2 );
+            }
+            catch( ezcGraphReducementFailedException $e )
+            {
+                return false;
+            }
         }
 
         $shape = new SWFShape();
@@ -616,7 +623,14 @@ class ezcGraphFlashDriver extends ezcGraphDriver
 
         if ( !$filled )
         {
-            $reduced = $this->reduceEllipseSize( $center, $width, $height, $startAngle, $endAngle, .5 );
+            try
+            {
+                $reduced = $this->reduceEllipseSize( $center, $width, $height, $startAngle, $endAngle, .5 );
+            }
+            catch( ezcGraphReducementFailedException $e )
+            {
+                return false;
+            }
 
             $startAngle = $reduced['startAngle'];
             $endAngle = $reduced['endAngle'];
diff --git a/src/driver/svg.php b/src/driver/svg.php
index daaa7c5..18ce4bd 100644
--- a/src/driver/svg.php
+++ b/src/driver/svg.php
@@ -332,7 +332,13 @@ class ezcGraphSvgDriver extends ezcGraphDriver
         {
             // The middle of the border is on the outline of a polygon in SVG, 
             // fix that:
-            $points = $this->reducePolygonSize( $points, $thickness / 2 );
+            try
+            {
+                $points = $this->reducePolygonSize( $points, $thickness / 2 );
+            } catch ( ezcGraphReducementFailedException $e )
+            {
+                return false;
+            }
         }
 
         $lastPoint = end( $points );
@@ -845,7 +851,13 @@ class ezcGraphSvgDriver extends ezcGraphDriver
         }
         else
         {
-            $reduced = $this->reduceEllipseSize( $center, $width * 2, $height * 2, $startAngle, $endAngle, .5 );
+            try
+            {
+                $reduced = $this->reduceEllipseSize( $center, $width * 2, $height * 2, $startAngle, $endAngle, .5 );
+            } catch ( ezcGraphReducementFailedException $e )
+            {
+                return false;
+            }
 
             $arc = $this->dom->createElement( 'path' );
             $arc->setAttribute( 'd', sprintf( 'M %.2f,%.2f L %.2f,%.2f A %.2f,%.2f 0 %d,1 %.2f,%.2f z',