[mapserver-commits] r10219 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2010-06-09 09:02:50 -0400 (Wed, 09 Jun 2010)
New Revision: 10219

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapagg.cpp
Log:
fix blending of transparent layers with AGG on MSB archs (#3471)


Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2010-06-09 13:02:03 UTC (rev 10218)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2010-06-09 13:02:50 UTC (rev 10219)
@@ -13,6 +13,7 @@
 
 Current Version:
 ----------------
+- fix blending of transparent layers with AGG on MSB archs (#3471)
 
 - Fix security exception issue in C# with MSVC2010 (#3438)
 

Modified: branches/branch-5-4/mapserver/mapagg.cpp
===================================================================
--- branches/branch-5-4/mapserver/mapagg.cpp	2010-06-09 13:02:03 UTC (rev 10218)
+++ branches/branch-5-4/mapserver/mapagg.cpp	2010-06-09 13:02:50 UTC (rev 10219)
@@ -94,8 +94,10 @@
 
 #ifdef CPL_MSB
 typedef agg::order_argb gd_color_order;
+typedef agg::blender_argb32_pre raw_pixel_blender;
 #else
 typedef agg::order_bgra gd_color_order;
+typedef agg::blender_bgra32_pre raw_pixel_blender;
 #endif
 
 typedef agg::blender_rgba_pre<agg::rgba8, gd_color_order> blender_pre; 
@@ -2599,7 +2601,7 @@
             //blend the src pixel over it.
             //the color channels must also be scaled by the opacity
             //as the blender expects premultiplied colors
-            agg::blender_bgra32_pre::blend_pix(p,
+            raw_pixel_blender::blend_pix(p,
                     MS_NINT(src_p[gd_color_order::R]*factor),
                     MS_NINT(src_p[gd_color_order::G]*factor),
                     MS_NINT(src_p[gd_color_order::B]*factor),