[Git][debian-gis-team/mapserver][experimental] 4 commits: New upstream version 7.6.0~rc1

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver


Commits:
ed9c24bf by Bas Couwenberg at 2020-04-06T05:54:47+02:00
New upstream version 7.6.0~rc1
- - - - -
3d788d05 by Bas Couwenberg at 2020-04-06T05:55:05+02:00
Update upstream source from tag 'upstream/7.6.0_rc1'

Update to upstream version '7.6.0~rc1'
with Debian dir ab4f712367626a995819c1987741846f18c93377
- - - - -
8a72c9a1 by Bas Couwenberg at 2020-04-06T05:55:37+02:00
New upstream release candidate.

- - - - -
ced1545a by Bas Couwenberg at 2020-04-06T05:56:52+02:00
Set distribution to experimental.

- - - - -


5 changed files:

- CMakeLists.txt
- HISTORY.TXT
- README.rst
- debian/changelog
- maputil.c


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 6)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta2")
+set (MapServer_VERSION_SUFFIX "-rc1")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.6.0-rc1 release (2020-04-05)
+------------------------------
+
+- Fix alpha value for hex colors (#6023)
+
 7.6.0-beta2 release (2020-03-28)
 --------------------------------
 


=====================================
README.rst
=====================================
@@ -17,7 +17,7 @@ applications can be enhanced using Java, JavaScript or many other web
 technologies. For more  information and complete documentation please 
 visit:
 
-  http://www.mapserver.org/
+  https://mapserver.org/
 
 Bug reports and enhancement submissions can be reported in the MapServer 
 issue tracker at the following url.   If you do make changes and/or enhancements, 
@@ -28,7 +28,7 @@ please let us know so that they might be incorporated into future releases.
 
 Join the MapServer user mailing list online at:
 
-  http://www.mapserver.org/community/lists.html
+  https://mapserver.org/community/lists.html
 
  
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mapserver (7.6.0~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 06 Apr 2020 05:56:37 +0200
+
 mapserver (7.6.0~beta2-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
maputil.c
=====================================
@@ -134,8 +134,10 @@ static int bindColorAttribute(colorObj *attribute, const char *value)
 
 static void bindStyle(layerObj *layer, shapeObj *shape, styleObj *style, int drawmode)
 {
+  int applyOpacity = MS_FALSE;
   assert(MS_DRAW_FEATURES(drawmode));
   if(style->numbindings > 0) {
+    applyOpacity = MS_TRUE;
     if(style->bindings[MS_STYLE_BINDING_SYMBOL].index != -1) {
       style->symbol = msGetSymbolIndex(&(layer->map->symbolset), shape->values[style->bindings[MS_STYLE_BINDING_SYMBOL].index], MS_TRUE);
       if(style->symbol == -1) style->symbol = 0; /* a reasonable default (perhaps should throw an error?) */
@@ -187,6 +189,7 @@ static void bindStyle(layerObj *layer, shapeObj *shape, styleObj *style, int dra
   }
   if (style->nexprbindings > 0)
   {
+    applyOpacity = MS_TRUE;
     if (style->exprBindings[MS_STYLE_BINDING_OFFSET_X].type == MS_EXPRESSION)
     {
       style->offsetx = msEvalDoubleExpression(
@@ -238,7 +241,8 @@ static void bindStyle(layerObj *layer, shapeObj *shape, styleObj *style, int dra
       msFree(txt);
     }
   }
-  if(style->opacity < 100 || style->color.alpha != 255 ) {
+
+  if(applyOpacity == MS_TRUE && (style->opacity < 100 || style->color.alpha != 255) ) {
     int alpha;
     alpha = MS_NINT(style->opacity*2.55);
     style->color.alpha = alpha;



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/f326d05ac4cad7f9f2c3b00eeef53fd804db5998...ced1545a823d81548508d6e8c37212712f2759a9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/f326d05ac4cad7f9f2c3b00eeef53fd804db5998...ced1545a823d81548508d6e8c37212712f2759a9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200406/ef03ac3e/attachment-0001.html>