[mapserver-commits] r9507 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-10-23 12:09:37 -0400 (Fri, 23 Oct 2009)
New Revision: 9507

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapprimitive.c
Log:
 Fix abs/fabs usage that prevented angle follow labels to be discarded if they were too wrapped on themselves


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-23 15:44:17 UTC (rev 9506)
+++ trunk/mapserver/HISTORY.TXT	2009-10-23 16:09:37 UTC (rev 9507)
@@ -13,6 +13,8 @@
 
 Current Version (SVN trunk):
 ----------------------------
+- Fix abs/fabs usage that prevented angle follow labels to be discarded if they
+  were too wrapped on themselves
 
 - Allow CGI mapshape and imgshape variables to consume WKT strings (#3185)
 

Modified: trunk/mapserver/mapprimitive.c
===================================================================
--- trunk/mapserver/mapprimitive.c	2009-10-23 15:44:17 UTC (rev 9506)
+++ trunk/mapserver/mapprimitive.c	2009-10-23 16:09:37 UTC (rev 9507)
@@ -1860,7 +1860,7 @@
             /* If the difference between subsequent angles is > 80% of 180deg
                bail because the line likely overlaps itself. */
    
-            if ( k > 2 && abs(theta - labelpath->angles[k-2]) > 0.4 * MS_PI ) {
+            if ( k > 2 && fabs(theta - labelpath->angles[k-2]) > 0.4 * MS_PI ) {
                 goto LABEL_FAILURE;
             }