[mapguide-commits] r5146 - in trunk/MgDev/Common: MdfModel MdfParser Renderers Stylization

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2010-09-17 20:19:39 +0000 (Fri, 17 Sep 2010)
New Revision: 5146

Modified:
   trunk/MgDev/Common/MdfModel/Makefile.am
   trunk/MgDev/Common/MdfParser/Makefile.am
   trunk/MgDev/Common/Renderers/Makefile.am
   trunk/MgDev/Common/Stylization/Stylizer.h
Log:
Additional watermark cleanup

- Fix Linux build


Modified: trunk/MgDev/Common/MdfModel/Makefile.am
===================================================================
--- trunk/MgDev/Common/MdfModel/Makefile.am	2010-09-17 19:02:45 UTC (rev 5145)
+++ trunk/MgDev/Common/MdfModel/Makefile.am	2010-09-17 20:19:39 UTC (rev 5146)
@@ -92,11 +92,19 @@
   TextFrame.cpp \
   TextSymbol.cpp \
   ThemeLabel.cpp \
+  TileWatermarkPosition.cpp \
   UnicodeString.cpp \
   VectorLayerDefinition.cpp \
   VectorScaleRange.cpp \
   Version.cpp \
-  W2DSymbol.cpp
+  W2DSymbol.cpp \
+  WatermarkAppearance.cpp \
+  WatermarkDefinition.cpp \
+  WatermarkInstance.cpp \
+  WatermarkPosition.cpp \
+  WatermarkXOffset.cpp \
+  WatermarkYOffset.cpp \
+  XYWatermarkPosition.cpp
 
 noinst_HEADERS = \
   Common/Color.h \
@@ -194,11 +202,20 @@
   TextFrame.h \
   TextSymbol.h \
   ThemeLabel.h \
+  TileWatermarkPosition.h \
   UnicodeString.h \
   VectorLayerDefinition.h \
   VectorScaleRange.h \
   Version.h \
   W2DSymbol.h \
+  WatermarkAppearance.h \
+  WatermarkDefinition.h \
+  WatermarkInstance.h \
+  WatermarkOffsetUnit.h \
+  WatermarkPosition.h \
+  WatermarkXOffset.h \
+  WatermarkYOffset.h \
+  XYWatermarkPosition.h \
   stdafx.h
 
 libMgMdfModel_la_LDFLAGS = -release $(PACKAGE_VERSION)

Modified: trunk/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- trunk/MgDev/Common/MdfParser/Makefile.am	2010-09-17 19:02:45 UTC (rev 5145)
+++ trunk/MgDev/Common/MdfParser/Makefile.am	2010-09-17 20:19:39 UTC (rev 5146)
@@ -93,11 +93,19 @@
   IOText.cpp \
   IOTextFrame.cpp \
   IOThemeLabel.cpp \
+  IOTileWatermarkPosition.cpp \
   IOUnknown.cpp \
   IOUtil.cpp \
   IOVectorLayerDefinition.cpp \
   IOVectorScaleRange.cpp \
   IOW2DSymbol.cpp \
+  IOWatermarkAppearance.cpp \
+  IOWatermarkDefinition.cpp \
+  IOWatermarkInstance.cpp \
+  IOWatermarkOffsetUnit.cpp \
+  IOWatermarkXOffset.cpp \
+  IOWatermarkYOffset.cpp \
+  IOXYWatermarkPosition.cpp \
   MdfParser.cpp \
   SAX2ElementHandler.cpp \
   SAX2Parser.cpp
@@ -186,11 +194,19 @@
   IOText.h \
   IOTextFrame.h \
   IOThemeLabel.h \
+  IOTileWatermarkPosition.h \
   IOUnknown.h \
   IOUtil.h \
   IOVectorLayerDefinition.h \
   IOVectorScaleRange.h \
   IOW2DSymbol.h \
+  IOWatermarkAppearance.h \
+  IOWatermarkDefinition.h \
+  IOWatermarkInstance.h \
+  IOWatermarkOffsetUnit.h \
+  IOWatermarkXOffset.h \
+  IOWatermarkYOffset.h \
+  IOXYWatermarkPosition.h \
   MdfParser.h \
   SAX2ElementHandler.h \
   SAX2Parser.h \

Modified: trunk/MgDev/Common/Renderers/Makefile.am
===================================================================
--- trunk/MgDev/Common/Renderers/Makefile.am	2010-09-17 19:02:45 UTC (rev 5145)
+++ trunk/MgDev/Common/Renderers/Makefile.am	2010-09-17 20:19:39 UTC (rev 5146)
@@ -38,6 +38,7 @@
   KmlPolyStyle.cpp \
   KmlRenderer.cpp \
   ObservationMesh.cpp \
+  RenderUtil.cpp \
   RS_ByteData.cpp \
   SymbolTrans.cpp \
   W2DRewriter.cpp \
@@ -67,6 +68,7 @@
   KmlRenderer.h \
   ObservationMesh.h \
   Renderers.h \
+  RenderUtil.h \
   RS_ByteData.h \
   RSDWFInputStream.h \
   RSDWFOutputStream.h \

Modified: trunk/MgDev/Common/Stylization/Stylizer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Stylizer.h	2010-09-17 19:02:45 UTC (rev 5145)
+++ trunk/MgDev/Common/Stylization/Stylizer.h	2010-09-17 20:19:39 UTC (rev 5146)
@@ -22,6 +22,7 @@
 #include "Bounds.h"
 #include "RS_InputStream.h"
 #include "RS_FeatureReader.h"
+#include "Foundation.h"
 
 //forward declare
 class Renderer;