[mapserver-commits] r9277 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-08-28 03:39:14 -0400 (Fri, 28 Aug 2009)
New Revision: 9277

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
fix clipping of polygon shapes in line layers (#3509)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-08-28 03:42:16 UTC (rev 9276)
+++ trunk/mapserver/HISTORY.TXT	2009-08-28 07:39:14 UTC (rev 9277)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- fix clipping of polygon shapes in line layers (#3509)
+
 - RFC 51 implementation: XML Mapfiles Format (#2872)
 
 - Fix output for valid WCS 1.1 XML (#3086)

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2009-08-28 03:42:16 UTC (rev 9276)
+++ trunk/mapserver/mapdraw.c	2009-08-28 07:39:14 UTC (rev 9277)
@@ -1910,7 +1910,10 @@
     }
 
     if(layer->transform == MS_TRUE) {
-      msClipPolylineRect(shape, cliprect);
+        if(shape->type == MS_SHAPE_POLYGON)
+          msClipPolygonRect(shape, cliprect);
+        else
+          msClipPolylineRect(shape, cliprect);
       if(shape->numlines == 0) {
         if(hasGeomTransform)
           msFreeShape(&nonClippedShape);