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

[svn_mapguide at osgeo.org]

Author: traianstanev
Date: 2011-11-18 12:20:26 -0800 (Fri, 18 Nov 2011)
New Revision: 6237

Modified:
   trunk/MgDev/Common/Renderers/AGGRenderer.cpp
   trunk/MgDev/Common/Renderers/DWFRenderer.cpp
   trunk/MgDev/Common/Renderers/GDRenderer.cpp
   trunk/MgDev/Common/Renderers/KmlRenderer.cpp
   trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
   trunk/MgDev/Common/Stylization/Renderer.h
   trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
   trunk/MgDev/Common/Stylization/SE_Renderer.cpp
   trunk/MgDev/Common/Stylization/SE_Renderer.h
Log:
Avoid inclusion of Fdo-related headers from Renderer.h and SE_Renderer.h by forward declaring certain classes and including the headers from the cpp files.

Modified: trunk/MgDev/Common/Renderers/AGGRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/AGGRenderer.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Renderers/AGGRenderer.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -62,6 +62,8 @@
 #include "DWFRSInputStream.h"
 #include "RSDWFInputStream.h"
 
+#include "SE_SymbolDefProxies.h"
+
 #include "RenderUtil.h"
 
 using namespace DWFToolkit;

Modified: trunk/MgDev/Common/Renderers/DWFRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/DWFRenderer.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Renderers/DWFRenderer.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -56,6 +56,8 @@
 #include "SLDSymbols.h"
 #include "RS_Font.h"
 
+#include "RS_FeatureReader.h"
+
 #include "FontManager.h"
 
 //GD headers

Modified: trunk/MgDev/Common/Renderers/GDRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/GDRenderer.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Renderers/GDRenderer.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -57,6 +57,7 @@
 
 #include "SymbolTrans.h"
 #include "RenderUtil.h"
+#include "SE_SymbolDefProxies.h"
 
 using namespace DWFToolkit;
 using namespace DWFCore;

Modified: trunk/MgDev/Common/Renderers/KmlRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/KmlRenderer.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Renderers/KmlRenderer.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -22,6 +22,7 @@
 #include "SLDSymbols.h"
 #include "UnicodeString.h"
 #include "PolygonUtils.h"
+#include "SE_SymbolDefProxies.h"
 
 #include "RenderUtil.h"
 

Modified: trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/ExpressionHelper.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Stylization/ExpressionHelper.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -29,7 +29,9 @@
 #include "ExpressionFunctionLookup.h"
 #include "ExpressionFunctionRange.h"
 
+#include "RS_FeatureReader.h"
 
+
 const RS_String s_Empty(L"");
 
 

Modified: trunk/MgDev/Common/Stylization/Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Renderer.h	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Stylization/Renderer.h	2011-11-18 20:20:26 UTC (rev 6237)
@@ -23,12 +23,13 @@
 #include "RendererStyles.h"
 #include "RS_InputStream.h"
 #include "RS_SymbolManager.h"
-#include "RS_FeatureReader.h"
 
+
 class LineBuffer;
 class CSysTransformer;
 class TransformMesh;
 class SE_BufferPool;
+class RS_FeatureReader;
 
 ///<summary>
 /// Base class for all Renderers. Renderers take stylization output and

Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -21,6 +21,8 @@
 #include "SE_SymbolManager.h"
 #include "SE_Bounds.h"
 #include "RS_FontEngine.h"
+#include "RS_FeatureReader.h"
+#include "SE_SymbolDefProxies.h"
 
 
 // Recomputes the bounds of an SE_RenderStyle that contains a text

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2011-11-18 20:20:26 UTC (rev 6237)
@@ -19,6 +19,7 @@
 #include "SE_Renderer.h"
 #include "SE_AreaPositioning.h"
 #include "RS_FontEngine.h"
+#include "SE_SymbolDefProxies.h"
 
 using namespace MDFMODEL_NAMESPACE;
 

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.h	2011-11-18 15:19:03 UTC (rev 6236)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.h	2011-11-18 20:20:26 UTC (rev 6237)
@@ -20,12 +20,12 @@
 
 #include "Renderer.h"
 #include "SE_BufferPool.h"
-#include "SE_SymbolDefProxies.h"
 #include "SE_RenderProxies.h"
 
 // forward declare
 class RS_FontEngine;
 struct HotSpot;
+class SE_ApplyContext;
 
 
 class SE_Renderer : public Renderer