[mapserver-commits] r13294 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-03-23 01:09:45 -0700 (Fri, 23 Mar 2012)
New Revision: 13294

Modified:
   trunk/mapserver/maputil.c
Log:
fix opacity calculation when color bindings are in use (#4260)


Modified: trunk/mapserver/maputil.c
===================================================================
--- trunk/mapserver/maputil.c	2012-03-21 23:44:12 UTC (rev 13293)
+++ trunk/mapserver/maputil.c	2012-03-23 08:09:45 UTC (rev 13294)
@@ -155,18 +155,6 @@
     if(style->bindings[MS_STYLE_BINDING_OPACITY].index != -1) {
       style->opacity = 100;
       bindIntegerAttribute(&style->opacity, shape->values[style->bindings[MS_STYLE_BINDING_OPACITY].index]);
-
-      if(style->opacity < 100) {
-        int alpha;
-	alpha = MS_NINT(style->opacity*2.55);
-
-	style->color.alpha = alpha;
-	style->outlinecolor.alpha = alpha;
-	style->backgroundcolor.alpha = alpha;
-
-	style->mincolor.alpha = alpha;
-	style->maxcolor.alpha = alpha;
-      }
     }
     if(style->bindings[MS_STYLE_BINDING_OFFSET_X].index != -1) {
         style->offsetx = 0;
@@ -188,7 +176,15 @@
         style->outlinewidth = 1;
         bindDoubleAttribute(&style->outlinewidth, shape->values[style->bindings[MS_STYLE_BINDING_OUTLINEWIDTH].index]);
     }
-
+    if(style->opacity < 100) {
+      int alpha;
+      alpha = MS_NINT(style->opacity*2.55);
+      style->color.alpha = alpha;
+      style->outlinecolor.alpha = alpha;
+      style->backgroundcolor.alpha = alpha;
+      style->mincolor.alpha = alpha;
+      style->maxcolor.alpha = alpha;
+    }
   }
 }