[mapguide-commits] r9134 - sandbox/adsk/3.1n/Common/Stylization

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2017-03-06 00:38:23 -0800 (Mon, 06 Mar 2017)
New Revision: 9134

Modified:
   sandbox/adsk/3.1n/Common/Stylization/StylizationEngine.cpp
Log:
Merge fix for #2754 to adsk 3.1n branch.
Fail to stylize layer when expression in symbol definition has invalid value

Modified: sandbox/adsk/3.1n/Common/Stylization/StylizationEngine.cpp
===================================================================
--- sandbox/adsk/3.1n/Common/Stylization/StylizationEngine.cpp	2017-02-22 01:35:25 UTC (rev 9133)
+++ sandbox/adsk/3.1n/Common/Stylization/StylizationEngine.cpp	2017-03-06 08:38:23 UTC (rev 9134)
@@ -1038,7 +1038,14 @@
 
             // evaluate the style (all expressions inside it) and convert to a
             // constant screen space render style
-            style->evaluate(&evalCtx);
+            try
+            {
+                style->evaluate(&evalCtx);
+            }
+            catch (FdoException* e)
+            {
+                ProcessStylizerException(e, __LINE__, __WFILE__);
+            }
 
             // compute offset to apply to the clipping bounds
             if (bClip)
@@ -1210,7 +1217,14 @@
                 else
                 {
                     // apply the style to the geometry using the renderer
-                    style->apply(&applyCtx);
+                    try
+                    {
+                        style->apply(&applyCtx);
+                    }
+                    catch (FdoException* e)
+                    {
+                        ProcessStylizerException(e, __LINE__, __WFILE__);
+                    }
                 }
             }
         }