[mapserver-commits] r12768 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-11-14 02:13:31 -0800 (Mon, 14 Nov 2011)
New Revision: 12768

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapgd.c
Log:
fix rendering offset on thick GD lines (#3962)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-14 10:13:09 UTC (rev 12767)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-14 10:13:31 UTC (rev 12768)
@@ -14,6 +14,8 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+- fix rendering offset on thick GD lines (#3962)
+
 - fix segfault on join with postgresql tables (#4074)
 
 - Fixed Python Mapscript does not write COLOR to reference map (#4042)

Modified: branches/branch-6-0/mapserver/mapgd.c
===================================================================
--- branches/branch-6-0/mapserver/mapgd.c	2011-11-14 10:13:09 UTC (rev 12767)
+++ branches/branch-6-0/mapserver/mapgd.c	2011-11-14 10:13:31 UTC (rev 12768)
@@ -350,8 +350,8 @@
      gdImageColorTransparent(brush,0);
      brush_fc = gdImageColorAllocate(brush, gdImageRed(ip,stroke->color->pen),
            gdImageGreen(ip,stroke->color->pen), gdImageBlue(ip,stroke->color->pen));
-     gdImageFilledEllipse(brush,ceil(stroke->width/2),ceil(stroke->width/2),
-           ceil(stroke->width),ceil(stroke->width), brush_fc);
+     gdImageFilledEllipse(brush,MS_NINT(brush->sx/2),MS_NINT(brush->sy/2),
+           MS_NINT(stroke->width),MS_NINT(stroke->width), brush_fc);
      gdImageSetBrush(ip, brush);
      if(stroke->patternlength > 0) {
        c = gdStyledBrushed;