[mapserver-commits] r11601 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-19 02:25:53 -0700 (Tue, 19 Apr 2011)
New Revision: 11601

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
fix circle layer drawing for edge case when point1.x==point2.x (#1356)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-19 05:14:52 UTC (rev 11600)
+++ trunk/mapserver/HISTORY.TXT	2011-04-19 09:25:53 UTC (rev 11601)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix circle layer drawing for edge case when point1.x==point2.x (#1356)
+
 - fix incorrect quantization for images with very large number of
   colors (#3848)
 

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2011-04-19 05:14:52 UTC (rev 11600)
+++ trunk/mapserver/mapdraw.c	2011-04-19 09:25:53 UTC (rev 11601)
@@ -1448,6 +1448,10 @@
     center.x = (shape->line[0].point[0].x + shape->line[0].point[1].x)/2.0;
     center.y = (shape->line[0].point[0].y + shape->line[0].point[1].y)/2.0;
     r = MS_ABS(center.x - shape->line[0].point[0].x);
+    if(r == 0)
+       r = MS_ABS(center.y - shape->line[0].point[0].y);
+    if(r == 0)
+       return(MS_SUCCESS);
 
     if(layer->transform == MS_TRUE) {