[mapserver-commits] r9907 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-03-01 09:56:35 -0500 (Mon, 01 Mar 2010)
New Revision: 9907

Modified:
   trunk/mapserver/mapgd2.c
Log:
Small changes to gd2 driver for line drawing.

Modified: trunk/mapserver/mapgd2.c
===================================================================
--- trunk/mapserver/mapgd2.c	2010-02-27 21:18:48 UTC (rev 9906)
+++ trunk/mapserver/mapgd2.c	2010-03-01 14:56:35 UTC (rev 9907)
@@ -275,28 +275,37 @@
   free(edge);
 }
 
+static void imagePolyline(gdImagePtr im, shapeObj *p, int c)
+{
+  int i, j;
+
+  for (i=0; i < p->numlines; i++)
+    for(j=1; j<p->line[i].numpoints; j++)
+      gdImageLine(im, (int) p->line[i].point[j-1].x, (int) p->line[i].point[j-1].y, (int) p->line[i].point[j].x, (int) p->line[i].point[j].y, c);
+}
+
 void renderLineGD(imageObj *img, shapeObj *p, strokeStyleObj *stroke) 
 {
-  int i, j;
   gdImagePtr ip;
+  int c;
 
   if(!img || !p || !stroke) return;
   ip = (gdImagePtr) img->img.plugin;
 
   if(stroke->color.pen == MS_PEN_UNSET) setPen(ip, &stroke->color);
-  for (i=0; i < p->numlines; i++)
-    for(j=1; j<p->line[i].numpoints; j++)
-      gdImageLine(ip, (int) p->line[i].point[j-1].x, (int) p->line[i].point[j-1].y, (int) p->line[i].point[j].x, (int) p->line[i].point[j].y, stroke->color.pen);
+  c = stroke->color.pen;
+
+  imagePolyline(ip, p, c);
 }
 
-void renderPolygonGD(imageObj *img, shapeObj *p, colorObj *c) 
+void renderPolygonGD(imageObj *img, shapeObj *p, colorObj *color) 
 {  
   gdImagePtr ip;
-  fprintf(stderr, "in renderPolygonGD(), r=%d, g=%d, b=%d\n", c->red, c->green, c->blue);
-  if(!img || !p || !c) return;
+
+  if(!img || !p || !color) return;
   ip = (gdImagePtr) img->img.plugin;
-  if(c->pen == MS_PEN_UNSET) setPen(ip, c);
-  imageFilledPolygon(ip, p, c->pen, 0, 0);
+  if(color->pen == MS_PEN_UNSET) setPen(ip, color);
+  imageFilledPolygon(ip, p, color->pen, 0, 0);
 }
 
 void renderGlyphsLineGD(imageObj *img, labelPathObj *labelpath, labelStyleObj *style, char *text) {