[mapserver-commits] r10218 - branches/branch-5-6/mapserver

[svn at osgeo.org]

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

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


Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-06-09 11:01:20 UTC (rev 10217)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-06-09 13:02:03 UTC (rev 10218)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
 
+- fix blending of transparent layers with AGG on MSB archs (#3471)
+
 - Fixed imageObj->saveImage() sends unnecessary headers (#3418) 
 
 - Correct PropertyName parsing for wfs post requests (#3235)

Modified: branches/branch-5-6/mapserver/mapagg.cpp
===================================================================
--- branches/branch-5-6/mapserver/mapagg.cpp	2010-06-09 11:01:20 UTC (rev 10217)
+++ branches/branch-5-6/mapserver/mapagg.cpp	2010-06-09 13:02:03 UTC (rev 10218)
@@ -85,8 +85,10 @@
 
 #ifdef CPL_MSB
 typedef mapserver::order_argb gd_color_order;
+typedef mapserver::blender_argb32_pre raw_pixel_blender;
 #else
 typedef mapserver::order_bgra gd_color_order;
+typedef mapserver::blender_bgra32_pre raw_pixel_blender;
 #endif
 
 typedef mapserver::blender_rgba_pre<mapserver::rgba8, gd_color_order> blender_pre; 
@@ -2506,7 +2508,7 @@
             //blend the src pixel over it.
             //the color channels must also be scaled by the opacity
             //as the blender expects premultiplied colors
-            mapserver::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),