[mapguide-commits] r8341 - in trunk/MgDev: . Common/Renderers Common/Stylization

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-08-20 07:21:17 -0700 (Wed, 20 Aug 2014)
New Revision: 8341

Modified:
   trunk/MgDev/
   trunk/MgDev/Common/Renderers/AGGRenderer.cpp
   trunk/MgDev/Common/Renderers/GDRenderer.cpp
   trunk/MgDev/Common/Stylization/SE_Renderer.cpp
Log:
Merged revision(s) 8340 from branches/2.6/MgDev:
#2481: The previous fix for #852 is incomplete. When SE_Renderer::SetRenderMode() is called without an RGBA value, it is supposed do default to blue with a pre-determined transparency but because that default color has an alpha component of 0, the fill is now fully transparent. The fix is to default to blue with an alpha of 255, that will result in the old behaviour.
........



Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163

Modified: trunk/MgDev/Common/Renderers/AGGRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/AGGRenderer.cpp	2014-08-20 14:03:31 UTC (rev 8340)
+++ trunk/MgDev/Common/Renderers/AGGRenderer.cpp	2014-08-20 14:21:17 UTC (rev 8341)
@@ -1408,7 +1408,7 @@
 //////////////////////////////////////////////////////////////////////////////
 void AGGRenderer::SetRenderSelectionMode(bool mode)
 {
-    SetRenderSelectionMode(mode, 0x0000FF00);
+    SetRenderSelectionMode(mode, 0x0000FFFF);
 }
 
 

Modified: trunk/MgDev/Common/Renderers/GDRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/GDRenderer.cpp	2014-08-20 14:03:31 UTC (rev 8340)
+++ trunk/MgDev/Common/Renderers/GDRenderer.cpp	2014-08-20 14:21:17 UTC (rev 8341)
@@ -1529,7 +1529,7 @@
 
 void GDRenderer::SetRenderSelectionMode(bool mode)
 {
-    SetRenderSelectionMode(mode, 0x0000FF00);
+    SetRenderSelectionMode(mode, 0x0000FFFF);
 }
 
 

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2014-08-20 14:03:31 UTC (rev 8340)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2014-08-20 14:21:17 UTC (rev 8341)
@@ -150,7 +150,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 void SE_Renderer::SetRenderSelectionMode(bool mode)
 {
-    SetRenderSelectionMode(mode, 0x0000FF00);
+    SetRenderSelectionMode(mode, 0x0000FFFF);
 }
 
 


Property changes on: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/jng/createruntimemap/Common/Stylization/SE_Renderer.cpp:7486-7555
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326
   + /branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev/Common/Stylization/SE_Renderer.cpp:8340
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/jng/createruntimemap/Common/Stylization/SE_Renderer.cpp:7486-7555
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326