[mapserver-commits] r8614 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-02-26 00:17:27 -0500 (Thu, 26 Feb 2009)
New Revision: 8614

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
   trunk/mapserver/mapgd.c
Log:
Fixed a problem where solid polygon fills (default symbol) was being scaled in unexpected ways. (#2896)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-26 05:10:53 UTC (rev 8613)
+++ trunk/mapserver/HISTORY.TXT	2009-02-26 05:17:27 UTC (rev 8614)
@@ -12,6 +12,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed a problem where default shade symbols (solid fill, no size) were being
+  scaled and not rendered as expected (related to #2896 I believe)
+
 - Fixed a problem with offset polylines (AGG only) (#2868)
 
 - Generate SLD version 1.1.0 (#473) 

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2009-02-26 05:10:53 UTC (rev 8613)
+++ trunk/mapserver/mapagg.cpp	2009-02-26 05:17:27 UTC (rev 8614)
@@ -3,7 +3,7 @@
  *
  * Project:  MapServer
  * Purpose:  AGG rendering and other AGG related functions.
- * Author:   Steve Lime and the MapServer team.
+ * Author:   Thomas Bonfort and the MapServer team.
  *
  ******************************************************************************
  * Copyright (c) 1996-2007 Regents of the University of Minnesota.
@@ -1786,7 +1786,7 @@
 
     if(!MS_VALID_COLOR(style->color) && symbol->type!=MS_SYMBOL_PIXMAP)
         return; // nothing to do (colors are not required with PIXMAP symbols)
-    if(size < 1) return; // size too small 
+    if(size < 1 && style->symbol != 0) return; // size too small AND we're not doing a basic solid fill (which can't be scaled so size doesn't matter)
 
     AGGMapserverRenderer* ren = getAGGRenderer(image);
     polygon_adaptor *polygons;

Modified: trunk/mapserver/mapgd.c
===================================================================
--- trunk/mapserver/mapgd.c	2009-02-26 05:10:53 UTC (rev 8613)
+++ trunk/mapserver/mapgd.c	2009-02-26 05:17:27 UTC (rev 8614)
@@ -2110,7 +2110,7 @@
 
   if(style->symbol >= symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK   */
   if(fc < 0 && symbol->type!=MS_SYMBOL_PIXMAP) return; /* nothing to do (colors are not required with PIXMAP symbols) */
-  if(size < 1) return; /* size too small */
+  if(size < 1 && style->symbol != 0) return; /* size too small AND we're not doing a basic solid fill (which can't be scaled so size doesn't matter) */
       
   if(style->symbol == 0) { /* simply draw a single pixel of the specified color */    
     if(style->antialias==MS_TRUE) {