[mapserver-commits] r10152 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-05-11 00:20:57 -0400 (Tue, 11 May 2010)
New Revision: 10152

Modified:
   trunk/mapserver/mapgd2.c
Log:
Enabled width and pattern support for GD2 line drawing.

Modified: trunk/mapserver/mapgd2.c
===================================================================
--- trunk/mapserver/mapgd2.c	2010-05-10 13:27:52 UTC (rev 10151)
+++ trunk/mapserver/mapgd2.c	2010-05-11 04:20:57 UTC (rev 10152)
@@ -307,7 +307,7 @@
 void renderLineGD(imageObj *img, shapeObj *p, strokeStyleObj *stroke) 
 {
   gdImagePtr ip;
-  int c;
+  int c, bc=gdTransparent;
 
   if(!img || !p || !stroke) return;
   ip = MS_IMAGE_GET_GDIMAGEPTR(img);
@@ -315,7 +315,39 @@
   if(stroke->color.pen == MS_PEN_UNSET) setPen(ip, &stroke->color);
   c = stroke->color.pen;
 
+  /* GD only has to worry about stroke width and pattern, no end cap or join */
+  if(stroke->width > 1) gdImageSetThickness(ip, stroke->width);
+
+  if(stroke->patternlength > 0) {
+    int *style;
+    int i, j, k=0;
+    int sc;
+
+    for(i=0; i<stroke->patternlength; i++)
+      k += MS_NINT(stroke->pattern[i]);
+    style = (int *) malloc (k * sizeof(int));
+
+    sc = c; /* start with the main color */    
+
+    k=0;
+    for(i=0; i<stroke->patternlength; i++) {
+      for(j=0; j<stroke->pattern[i]; j++, k++) {
+        style[k] = sc;
+      }
+      sc = ((sc==c)?bc:c);
+    }
+
+    gdImageSetStyle(ip, style, k);
+    free(style);
+
+    c = gdStyled;
+  }
+    
+  /* finally draw something */
   imagePolyline(ip, p, c);
+
+  /* clean up */
+  gdImageSetThickness(ip, 1);
 }
 
 void renderPolygonGD(imageObj *img, shapeObj *p, colorObj *color)