[mapserver-commits] r11384 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-30 06:53:37 -0700 (Wed, 30 Mar 2011)
New Revision: 11384

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
fix some valgrind errors on agg rotated pixmap symbols

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-30 11:15:32 UTC (rev 11383)
+++ trunk/mapserver/HISTORY.TXT	2011-03-30 13:53:37 UTC (rev 11384)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- fix some valgrind errors on agg rotated pixmap symbols
+
 - WCS 2.0: Adjusted definition of NilValues.
 
 - Fixed handling of PROJ_LIB value relative to mapfile path (#3094)

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2011-03-30 11:15:32 UTC (rev 11383)
+++ trunk/mapserver/mapagg.cpp	2011-03-30 13:53:37 UTC (rev 11384)
@@ -460,7 +460,7 @@
 		// "hardcoded" bilinear filter
 		//------------------------------------------
 		typedef mapserver::span_image_filter_rgba_bilinear_clip<pixel_format, interpolator_type> span_gen_type;
-		span_gen_type sg(pf, mapserver::rgba( ), interpolator);
+		span_gen_type sg(pf, mapserver::rgba(0,0,0,0), interpolator);
 		mapserver::path_storage pixmap_bbox;
 		int ims_2 = MS_NINT(MS_MAX(pixmap->width,pixmap->height)*style->scale*1.415)/2+1;
 
@@ -470,7 +470,7 @@
 		pixmap_bbox.line_to(x-ims_2,y+ims_2);
 
 		r->m_rasterizer_aa.add_path(pixmap_bbox);
-		mapserver::render_scanlines_aa(r->m_rasterizer_aa, r->sl_line, r->m_renderer_base, sa, sg);
+		mapserver::render_scanlines_aa(r->m_rasterizer_aa, r->sl_poly, r->m_renderer_base, sa, sg);
 	}
 	else {
 		//just copy the image at the correct location (we place the pixmap on