[mapguide-commits] r5172 - trunk/MgDev/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 21 13:55:08 EDT 2010
Author: waltweltonlair
Date: 2010-09-21 17:55:08 +0000 (Tue, 21 Sep 2010)
New Revision: 5172
Modified:
trunk/MgDev/Common/Stylization/DefaultStylizer.cpp
trunk/MgDev/Common/Stylization/DefaultStylizer.h
trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
trunk/MgDev/Common/Stylization/GeometryAdapter.cpp
trunk/MgDev/Common/Stylization/PointAdapter.cpp
trunk/MgDev/Common/Stylization/PolygonAdapter.cpp
trunk/MgDev/Common/Stylization/PolylineAdapter.cpp
trunk/MgDev/Common/Stylization/RS_FontEngine.cpp
trunk/MgDev/Common/Stylization/SE_AreaPositioning.cpp
trunk/MgDev/Common/Stylization/SE_ExpressionBase.cpp
trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
trunk/MgDev/Common/Stylization/StylizationEngine.cpp
trunk/MgDev/Common/Stylization/StylizationEngine.h
trunk/MgDev/Common/Stylization/StylizationUtil.cpp
trunk/MgDev/Common/Stylization/Stylizer.h
trunk/MgDev/Common/Stylization/ThemeParameters.cpp
trunk/MgDev/Common/Stylization/stdafx.h
Log:
Eliminate many references to Foundation.h in the Stylization project. Ideally we don't want Stylization to depend on
the Foundation component (and its dependencies, like ACE).
Modified: trunk/MgDev/Common/Stylization/DefaultStylizer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/DefaultStylizer.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/DefaultStylizer.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -232,10 +232,10 @@
//////////////////////////////////////////////////////////////////////////////
void DefaultStylizer::StylizeWatermark(Renderer* renderer,
MdfModel::WatermarkDefinition* watermark,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight)
+ int drawWidth,
+ int drawHeight,
+ int saveWidth,
+ int saveHeight)
{
m_styleEngine->StylizeWatermark((SE_Renderer*)renderer, watermark, drawWidth, drawHeight, saveWidth, saveHeight);
m_styleEngine->ClearCache();
Modified: trunk/MgDev/Common/Stylization/DefaultStylizer.h
===================================================================
--- trunk/MgDev/Common/Stylization/DefaultStylizer.h 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/DefaultStylizer.h 2010-09-21 17:55:08 UTC (rev 5172)
@@ -61,10 +61,10 @@
STYLIZATION_API virtual void StylizeWatermark(Renderer* renderer,
MdfModel::WatermarkDefinition* watermark,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight);
+ int drawWidth,
+ int drawHeight,
+ int saveWidth,
+ int saveHeight);
STYLIZATION_API virtual void SetGeometryAdapter(FdoGeometryType type, GeometryAdapter* stylizer);
Modified: trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/ExpressionHelper.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/ExpressionHelper.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -28,7 +28,6 @@
#include "ExpressionFunctionIf.h"
#include "ExpressionFunctionLookup.h"
#include "ExpressionFunctionRange.h"
-#include "Foundation.h"
const RS_String s_Empty(L"");
Modified: trunk/MgDev/Common/Stylization/GeometryAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/GeometryAdapter.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/GeometryAdapter.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -21,7 +21,6 @@
#include "SymbolVisitor.h"
#include "SLDSymbols.h"
#include "ExpressionHelper.h"
-#include "Foundation.h"
extern void ProcessStylizerException(FdoException* exception, int line, wchar_t* file);
Modified: trunk/MgDev/Common/Stylization/PointAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/PointAdapter.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/PointAdapter.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -20,7 +20,6 @@
#include "PointAdapter.h"
#include "LineBuffer.h"
#include "FeatureTypeStyleVisitor.h"
-#include "Foundation.h"
//////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Stylization/PolygonAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/PolygonAdapter.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/PolygonAdapter.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -20,7 +20,6 @@
#include "PolygonAdapter.h"
#include "LineBuffer.h"
#include "FeatureTypeStyleVisitor.h"
-#include "Foundation.h"
//////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Stylization/PolylineAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/PolylineAdapter.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/PolylineAdapter.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -20,7 +20,6 @@
#include "PolylineAdapter.h"
#include "LineBuffer.h"
#include "FeatureTypeStyleVisitor.h"
-#include "Foundation.h"
//////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Stylization/RS_FontEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/RS_FontEngine.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/RS_FontEngine.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -20,7 +20,6 @@
#include "RS_FontEngine.h"
#include "RichTextEngine.h"
#include "SE_Renderer.h"
-#include "Foundation.h"
//////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Stylization/SE_AreaPositioning.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_AreaPositioning.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/SE_AreaPositioning.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -17,7 +17,6 @@
#include "stdafx.h"
#include "SE_AreaPositioning.h"
-#include "Foundation.h"
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Stylization/SE_ExpressionBase.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_ExpressionBase.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/SE_ExpressionBase.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -18,10 +18,7 @@
#include "stdafx.h"
#include "SE_ExpressionBase.h"
#include "StylizationEngine.h"
-#include "Foundation.h"
-
#include "SimpleSymbolDefinition.h"
-
#include <wctype.h>
using namespace MDFMODEL_NAMESPACE;
Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -21,7 +21,6 @@
#include "SE_SymbolManager.h"
#include "SE_Bounds.h"
#include "RS_FontEngine.h"
-#include "Foundation.h"
// Recomputes the bounds of an SE_RenderStyle that contains a text
Modified: trunk/MgDev/Common/Stylization/StylizationEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -241,10 +241,10 @@
// ** compiler warnings being generated
void StylizationEngine::StylizeWatermark(SE_Renderer* se_renderer,
WatermarkDefinition* watermark,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight)
+ int drawWidth,
+ int drawHeight,
+ int saveWidth,
+ int saveHeight)
{
m_serenderer = se_renderer;
m_reader = NULL;
Modified: trunk/MgDev/Common/Stylization/StylizationEngine.h
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.h 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.h 2010-09-21 17:55:08 UTC (rev 5172)
@@ -72,10 +72,10 @@
//Stylize the supplied watermark
void StylizeWatermark(SE_Renderer* se_renderer,
WatermarkDefinition* watermark,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight);
+ int drawWidth,
+ int drawHeight,
+ int saveWidth,
+ int saveHeight);
// Stylizes the current feature on the reader using the supplied composite type style.
void Stylize(RS_FeatureReader* reader,
Modified: trunk/MgDev/Common/Stylization/StylizationUtil.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationUtil.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/StylizationUtil.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -23,7 +23,6 @@
#include "SLDSymbols.h"
#include "SE_StyleVisitor.h"
#include "SE_BufferPool.h"
-#include "Foundation.h"
extern void ProcessStylizerException(FdoException* exception, int line, wchar_t* file);
Modified: trunk/MgDev/Common/Stylization/Stylizer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Stylizer.h 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/Stylizer.h 2010-09-21 17:55:08 UTC (rev 5172)
@@ -22,7 +22,6 @@
#include "Bounds.h"
#include "RS_InputStream.h"
#include "RS_FeatureReader.h"
-#include "Foundation.h"
//forward declare
class Renderer;
@@ -81,10 +80,10 @@
///</summary>
virtual void StylizeWatermark(Renderer* renderer,
MdfModel::WatermarkDefinition* watermark,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight) = 0;
+ int drawWidth,
+ int drawHeight,
+ int saveWidth,
+ int saveHeight) = 0;
///<summary>
/// Allows a user to set a custom stylization object for a given geometry type.
Modified: trunk/MgDev/Common/Stylization/ThemeParameters.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/ThemeParameters.cpp 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/ThemeParameters.cpp 2010-09-21 17:55:08 UTC (rev 5172)
@@ -17,7 +17,6 @@
#include "stdafx.h"
#include "ThemeParameters.h"
-#include "Foundation.h"
static const wchar_t* sEmpty = L"";
Modified: trunk/MgDev/Common/Stylization/stdafx.h
===================================================================
--- trunk/MgDev/Common/Stylization/stdafx.h 2010-09-21 16:53:51 UTC (rev 5171)
+++ trunk/MgDev/Common/Stylization/stdafx.h 2010-09-21 17:55:08 UTC (rev 5172)
@@ -28,4 +28,11 @@
// when aggressive inlining is turned on in the project file.
#define __ACE_INLINE__ 0
+#else
+
+#define _wcsicmp wcscasecmp
+#define _wcsnicmp wcsncasecmp
+
+#define _isnan isnan
+
#endif
More information about the mapguide-commits
mailing list