[mapserver-commits] r11243 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2011-03-18 09:46:58 -0700 (Fri, 18 Mar 2011)
New Revision: 11243

Modified:
   trunk/mapserver/mapagg.cpp
Log:
use background image color if we have it, and the format is not transparent but keep use_alpha separate from that - based primarily on imagemode

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2011-03-18 16:46:17 UTC (rev 11242)
+++ trunk/mapserver/mapagg.cpp	2011-03-18 16:46:58 UTC (rev 11243)
@@ -657,12 +657,14 @@
    r->m_pixel_format.attach(r->m_rendering_buffer);
    r->m_renderer_base.attach(r->m_pixel_format);
    r->m_renderer_scanline.attach(r->m_renderer_base);
-   if (format->transparent || !bg || !MS_VALID_COLOR(*bg)
-       || format->imagemode == MS_IMAGEMODE_RGBA ) {
+   if( bg && !format->transparent )
+      r->m_renderer_base.clear(aggColor(bg));
+   else
       r->m_renderer_base.clear(AGG_NO_COLOR);
+
+   if (format->transparent || format->imagemode == MS_IMAGEMODE_RGBA ) {
       r->use_alpha = true;
    } else {
-      r->m_renderer_base.clear(aggColor(bg));
       r->use_alpha = false;
    }
    image->img.plugin = (void*) r;