[mapserver-commits] r13145 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2012-02-13 20:53:12 -0800 (Mon, 13 Feb 2012)
New Revision: 13145

Modified:
   trunk/mapserver/mapagg.cpp
   trunk/mapserver/mapkmlrenderer.cpp
Log:
Make sure KML support compiles after multi-label changes...

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2012-02-13 21:58:25 UTC (rev 13144)
+++ trunk/mapserver/mapagg.cpp	2012-02-14 04:53:12 UTC (rev 13145)
@@ -794,7 +794,8 @@
    pixel_format pf(b);
    AGG2Renderer *r = AGG_RENDERER(dest);
    mapserver::rect_base<int> src_rect(srcX,srcY,srcX+width,srcY+height);
-   r->m_renderer_base.blend_from(pf,&src_rect, dstX-srcX, dstY-srcY, unsigned(opacity * 255));
+   // r->m_renderer_base.blend_from(pf,&src_rect, dstX-srcX, dstY-srcY, unsigned(opacity * 255));
+   r->m_renderer_base.blend_from(pf,&src_rect, dstX, dstY, unsigned(opacity * 255));
    return MS_SUCCESS;
 }
 

Modified: trunk/mapserver/mapkmlrenderer.cpp
===================================================================
--- trunk/mapserver/mapkmlrenderer.cpp	2012-02-13 21:58:25 UTC (rev 13144)
+++ trunk/mapserver/mapkmlrenderer.cpp	2012-02-14 04:53:12 UTC (rev 13145)
@@ -233,7 +233,7 @@
     /*if there are labels we want the coordinates to 
       be the center of the element.*/
     for(i=0; i<layer->numclasses; i++)
-      layer->_class[i]->label.position = MS_XY;
+      if(layer->_class[i]->numlabels > 0) layer->_class[i]->labels[0]->position = MS_XY;
    
     /*we do not want to draw multiple styles.
       the new rendering architecture does not allow