[mapguide-commits] r9350 - sandbox/jng/common_decouple/Common/Stylization

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-03 08:41:36 -0800 (Sat, 03 Mar 2018)
New Revision: 9350

Modified:
   sandbox/jng/common_decouple/Common/Stylization/SE_SymbolDefProxies.cpp
   sandbox/jng/common_decouple/Common/Stylization/StylizationEngine.cpp
Log:
Post-merge build fixes

Modified: sandbox/jng/common_decouple/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- sandbox/jng/common_decouple/Common/Stylization/SE_SymbolDefProxies.cpp	2018-03-03 16:14:43 UTC (rev 9349)
+++ sandbox/jng/common_decouple/Common/Stylization/SE_SymbolDefProxies.cpp	2018-03-03 16:41:36 UTC (rev 9350)
@@ -278,14 +278,11 @@
     else // default is Round
         ret->lineStroke.join = SE_LineJoin_Round;
 
-    ret->scaleX = scaleX.evaluate(ctx->exec);
-    ret->scaleY = scaleY.evaluate(ctx->exec);
-
     // populate the line buffer
-    double dScaleX = scaleX.evaluate(ctx->eval);
-    double dScaleY = scaleY.evaluate(ctx->eval);
+    ret->scaleX = scaleX.evaluate(ctx->eval);
+    ret->scaleY = scaleY.evaluate(ctx->eval);
 
-    if(dScaleX != 1.0 || dScaleY != 1.0)
+    if(ret->scaleX != 1.0 || ret->scaleY != 1.0)
     {
         // combine the path scaling with the style transform
         SE_Matrix xform(ret->scaleX, 0.0, 0.0, 0.0, ret->scaleY, 0.0);

Modified: sandbox/jng/common_decouple/Common/Stylization/StylizationEngine.cpp
===================================================================
--- sandbox/jng/common_decouple/Common/Stylization/StylizationEngine.cpp	2018-03-03 16:14:43 UTC (rev 9349)
+++ sandbox/jng/common_decouple/Common/Stylization/StylizationEngine.cpp	2018-03-03 16:41:36 UTC (rev 9350)
@@ -1024,14 +1024,9 @@
 
             // evaluate the style (all expressions inside it) and convert to a
             // constant screen space render style
-            try
-            {
+            STYLIZATION_TRY()
                 style->evaluate(&evalCtx);
-            }
-            catch (FdoException* e)
-            {
-                ProcessStylizerException(e, __LINE__, __WFILE__);
-            }
+            STYLIZATION_CATCH(L"StylizationEngine.Stylize")
 
             // compute offset to apply to the clipping bounds
             if (bClip)
@@ -1203,14 +1198,9 @@
                 else
                 {
                     // apply the style to the geometry using the renderer
-                    try
-                    {
+                    STYLIZATION_TRY()
                         style->apply(&applyCtx);
-                    }
-                    catch (FdoException* e)
-                    {
-                        ProcessStylizerException(e, __LINE__, __WFILE__);
-                    }
+                    STYLIZATION_CATCH(L"StylizationEngine.Stylize")
                 }
             }
         }