[mapguide-commits] r1381 - trunk/MgDev/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 27 12:23:03 EDT 2007
Author: waltweltonlair
Date: 2007-03-27 12:23:03 -0400 (Tue, 27 Mar 2007)
New Revision: 1381
Modified:
trunk/MgDev/Common/Stylization/BooleanValue.h
trunk/MgDev/Common/Stylization/Centroid.h
trunk/MgDev/Common/Stylization/DWFRSInputStream.h
trunk/MgDev/Common/Stylization/DataValue.h
trunk/MgDev/Common/Stylization/DataValuePool.h
trunk/MgDev/Common/Stylization/DateTimeValue.h
trunk/MgDev/Common/Stylization/DefaultStylizer.h
trunk/MgDev/Common/Stylization/DoubleValue.h
trunk/MgDev/Common/Stylization/EMapRenderer.h
trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h
trunk/MgDev/Common/Stylization/GDFillPatterns.h
trunk/MgDev/Common/Stylization/GDUtils.h
trunk/MgDev/Common/Stylization/GDW2DRewriter.h
trunk/MgDev/Common/Stylization/Int64Value.h
trunk/MgDev/Common/Stylization/LineStyleDef.h
trunk/MgDev/Common/Stylization/ObservationMesh.h
trunk/MgDev/Common/Stylization/PointAdapter.h
trunk/MgDev/Common/Stylization/PolygonAdapter.h
trunk/MgDev/Common/Stylization/PolylineAdapter.h
trunk/MgDev/Common/Stylization/RSDWFInputStream.h
trunk/MgDev/Common/Stylization/RSDWFOutputStream.h
trunk/MgDev/Common/Stylization/RasterAdapter.h
trunk/MgDev/Common/Stylization/StringValue.h
trunk/MgDev/Common/Stylization/SymbolManager.h
trunk/MgDev/Common/Stylization/SymbolTrans.h
trunk/MgDev/Common/Stylization/whip_fill_library.h
trunk/MgDev/Common/Stylization/whip_hatch_library.h
Log:
Many header files in Stylization were missing the #define/#endif
code to prevent them from being loaded twice. I went through all
the stylization headers and added it to those where it was missing.
Modified: trunk/MgDev/Common/Stylization/BooleanValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/BooleanValue.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/BooleanValue.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef BOOLEANVALUE_H
+#define BOOLEANVALUE_H
+
#include "DataValue.h"
class BooleanValue : public DataValue
@@ -54,3 +57,5 @@
bool m_value;
wchar_t* m_strValue;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/Centroid.h
===================================================================
--- trunk/MgDev/Common/Stylization/Centroid.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/Centroid.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef CENTROID_H
+#define CENTROID_H
+
class Centroid
{
public:
@@ -27,3 +30,5 @@
static void PolygonCentroidBVM(double* pts, int len, double* cx, double* cy);
static void PolygonCentroidWMC(double* pts, int len, double* cx, double* cy);
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/DWFRSInputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/DWFRSInputStream.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DWFRSInputStream.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef DWFRSINPUTSTREAM_H
+#define DWFRSINPUTSTREAM_H
+
#include "Renderer.h"
#include "dwfcore/InputStream.h"
@@ -49,3 +52,5 @@
private:
RS_InputStream* m_in;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/DataValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/DataValue.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DataValue.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -62,9 +62,6 @@
virtual FdoDateTime GetAsDateTime() = 0;
virtual DataValueType GetType() = 0;
-
-private:
-
};
#endif
Modified: trunk/MgDev/Common/Stylization/DataValuePool.h
===================================================================
--- trunk/MgDev/Common/Stylization/DataValuePool.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DataValuePool.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef DATAVALUEPOOL_H
+#define DATAVALUEPOOL_H
+
#include "DataValueStack.h"
//forward declare
@@ -130,3 +133,5 @@
DataValueStack<BooleanValue> m_boolPool;
DataValueStack<DateTimeValue> m_datePool;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/DateTimeValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/DateTimeValue.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DateTimeValue.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef DATETIMEVALUE_H
+#define DATETIMEVALUE_H
+
#include "DataValue.h"
class DateTimeValue : public DataValue
@@ -54,3 +57,5 @@
FdoDateTime m_value;
wchar_t* m_strValue;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/DefaultStylizer.h
===================================================================
--- trunk/MgDev/Common/Stylization/DefaultStylizer.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DefaultStylizer.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef DEFAULTSTYLIZER_H
+#define DEFAULTSTYLIZER_H
+
#include "Stylizer.h"
class LineBufferPool;
@@ -73,3 +76,5 @@
LineBufferPool* m_lbPool;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/DoubleValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/DoubleValue.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/DoubleValue.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef DOUBLEVALUE_H
+#define DOUBLEVALUE_H
+
#include "DataValue.h"
class DoubleValue : public DataValue
@@ -55,3 +58,5 @@
double m_value;
wchar_t* m_strValue;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/EMapRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/EMapRenderer.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/EMapRenderer.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef EMAPRENDERER_H
+#define EMAPRENDERER_H
+
#include "DWFRenderer.h"
#include <list>
@@ -107,3 +110,5 @@
layerinfo_map m_hGroups;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef EMAPUPDATERENDERER_H
+#define EMAPUPDATERENDERER_H
+
#include "DWFRenderer.h"
#include <list>
@@ -118,3 +121,5 @@
layerinfo_list m_lLayerInfos;
std::map<RS_String, DWFEMapLayer*> m_hAddedLayers;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/GDFillPatterns.h
===================================================================
--- trunk/MgDev/Common/Stylization/GDFillPatterns.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/GDFillPatterns.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef GDFILLPATTERNS_H
+#define GDFILLPATTERNS_H
+
#include "gd.h"
class GDFillPatterns
@@ -22,3 +25,5 @@
public:
static gdImagePtr CreatePatternBitmap(const wchar_t* name, int fgColor, int bgColor);
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/GDUtils.h
===================================================================
--- trunk/MgDev/Common/Stylization/GDUtils.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/GDUtils.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef GDUTILS_H
+#define GDUTILS_H
+
#include "gd.h"
#include "RendererStyles.h"
@@ -26,3 +29,5 @@
void rs_gdImageCircleForBrush(gdImagePtr im, int x, int y, int rad, RS_Color& color);
gdImagePtr rs_gdImageThickLineBrush(int line_weight, RS_Color& color);
+
+#endif
Modified: trunk/MgDev/Common/Stylization/GDW2DRewriter.h
===================================================================
--- trunk/MgDev/Common/Stylization/GDW2DRewriter.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/GDW2DRewriter.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef GDW2DREWRITER_H
+#define GDW2DREWRITER_H
+
#include "whiptk/whip_toolkit.h"
// Standard action routines.
@@ -93,3 +96,5 @@
WT_Result gdr_process_fillPattern (WT_Fill_Pattern & fillPattern, WT_File & file);
//WT_Result gdr_process_DigitalSign (WT_SignData & digitalSing, WT_File & file);
//WT_Result gdr_process_dwf_header (WT_DWF_Header & dwf_header, WT_File & file);
+
+#endif
Modified: trunk/MgDev/Common/Stylization/Int64Value.h
===================================================================
--- trunk/MgDev/Common/Stylization/Int64Value.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/Int64Value.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef INT64VALUE_H
+#define INT64VALUE_H
+
#include "DataValue.h"
class Int64Value : public DataValue
@@ -55,3 +58,5 @@
long long m_value;
wchar_t* m_strValue;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/LineStyleDef.h
===================================================================
--- trunk/MgDev/Common/Stylization/LineStyleDef.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/LineStyleDef.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef LINESTYLEDEF_H
+#define LINESTYLEDEF_H
+
#include "dwf/whiptk/whip_toolkit.h"
// enumeration defining the supported decorations
@@ -53,3 +56,5 @@
int m_nRuns; // number of elements in m_pixelRuns array
PixelRun* m_pixelRuns; // definition of the line style as pixel runs
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/ObservationMesh.h
===================================================================
--- trunk/MgDev/Common/Stylization/ObservationMesh.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/ObservationMesh.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef OBSERVATIONMESH_H
+#define OBSERVATIONMESH_H
+
//disable conditional expression is constant warning
#ifdef _WIN32
#pragma warning(disable : 4127)
@@ -122,3 +125,5 @@
CSysTransformer* m_xformer;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/PointAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PointAdapter.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/PointAdapter.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef POINTADAPTER_H
+#define POINTADAPTER_H
+
#include "GeometryAdapter.h"
class LineBuffer;
@@ -41,3 +44,5 @@
std::map<void*, RS_MarkerDef*> m_hPointSymCache;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/PolygonAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PolygonAdapter.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/PolygonAdapter.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef POLYGONADAPTER_H
+#define POLYGONADAPTER_H
+
#include "GeometryAdapter.h"
class LineBuffer;
@@ -41,3 +44,5 @@
std::map<void*, RS_FillStyle*> m_hAreaSymCache;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/PolylineAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PolylineAdapter.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/PolylineAdapter.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef POLYLINEADAPTER_H
+#define POLYLINEADAPTER_H
+
#include "GeometryAdapter.h"
class LineBuffer;
@@ -41,3 +44,5 @@
std::map<void*, RS_LineStroke*> m_hLineSymCache;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/RSDWFInputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RSDWFInputStream.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/RSDWFInputStream.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef RSDWFINPUTSTREAM_H
+#define RSDWFINPUTSTREAM_H
+
#include "Renderer.h"
#include "dwfcore/InputStream.h"
@@ -49,3 +52,5 @@
private:
DWFInputStream* m_in;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/RSDWFOutputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RSDWFOutputStream.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/RSDWFOutputStream.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef RSDWFOUTPUTSTREAM_H
+#define RSDWFOUTPUTSTREAM_H
+
#include "Renderer.h"
#include "RS_OutputStream.h"
#include "dwfcore/OutputStream.h"
@@ -45,3 +48,5 @@
private:
DWFOutputStream* m_out;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/RasterAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/RasterAdapter.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/RasterAdapter.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef RASTERADAPTER_H
+#define RASTERADAPTER_H
+
#include "GeometryAdapter.h"
class RasterAdapter : public GeometryAdapter
@@ -41,3 +44,5 @@
protected:
RS_FilterExecutor* m_exec;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/StringValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/StringValue.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/StringValue.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef STRINGVALUE_H
+#define STRINGVALUE_H
+
#include "DataValue.h"
class StringValue : public DataValue
@@ -54,3 +57,5 @@
wchar_t* m_value;
bool m_bDisposeValue;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/SymbolManager.h
===================================================================
--- trunk/MgDev/Common/Stylization/SymbolManager.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/SymbolManager.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -28,7 +28,6 @@
public:
virtual const RS_InputStream* GetSymbolData(const wchar_t* libraryName,
const wchar_t* symbolName) = 0;
-
};
#endif
Modified: trunk/MgDev/Common/Stylization/SymbolTrans.h
===================================================================
--- trunk/MgDev/Common/Stylization/SymbolTrans.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/SymbolTrans.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -15,6 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#ifndef SYMBOLTRANS_H
+#define SYMBOLTRANS_H
+
#include "CSysTransformer.h"
#include "Bounds.h"
@@ -65,3 +68,5 @@
double m_widthScale;
double m_heightScale;
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/whip_fill_library.h
===================================================================
--- trunk/MgDev/Common/Stylization/whip_fill_library.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/whip_fill_library.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -24,6 +24,9 @@
// fillFac.request_pattern( EMapFillPatternFactory::Shapefill51, fsfp );
// pwtf->desired_rendition().set_fill_pattern() = fsfp;
+#ifndef WHIP_FILL_LIBRARY_H
+#define WHIP_FILL_LIBRARY_H
+
class EMapFillPatternFactory {
public:
enum Enum {
@@ -1028,3 +1031,5 @@
return nonexistent;
}
};
+
+#endif
Modified: trunk/MgDev/Common/Stylization/whip_hatch_library.h
===================================================================
--- trunk/MgDev/Common/Stylization/whip_hatch_library.h 2007-03-27 16:13:32 UTC (rev 1380)
+++ trunk/MgDev/Common/Stylization/whip_hatch_library.h 2007-03-27 16:23:03 UTC (rev 1381)
@@ -24,6 +24,9 @@
// hatchFac.request_pattern( EMapHatchPatternFactory::Net, fsfp );
// pwtf->desired_rendition().set_hatch_pattern() = fsfp;
+#ifndef WHIP_HATCH_LIBRARY_H
+#define WHIP_HATCH_LIBRARY_H
+
class EMapHatchPatternFactory {
public:
enum Enum {
@@ -2293,3 +2296,5 @@
return nonexistent;
}
};
+
+#endif
More information about the mapguide-commits
mailing list