[mapguide-commits] r4615 - in trunk/MgDev/Common/Geometry: . Spatial
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 2 19:36:33 EST 2010
Author: NormOlsen
Date: 2010-03-02 19:36:32 -0500 (Tue, 02 Mar 2010)
New Revision: 4615
Modified:
trunk/MgDev/Common/Geometry/Geometry.vcproj
trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
Log:
Build fix for Windows & Linux :<(. Also correct a memory leak. (Thanks Walt)
Modified: trunk/MgDev/Common/Geometry/Geometry.vcproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcproj 2010-03-03 00:34:23 UTC (rev 4614)
+++ trunk/MgDev/Common/Geometry/Geometry.vcproj 2010-03-03 00:36:32 UTC (rev 4615)
@@ -66,7 +66,7 @@
AdditionalDependencies="ACEd.lib GEOSd.lib csmapd.lib"
OutputFile="$(OutDir)\MgGeometryd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;"..\..\Oem\geos-2.2.0\VisualStudio\Debug";..\..\..\MetaCrs\CsMap\lib80\Debug"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;"..\..\Oem\geos-2.2.0\VisualStudio\Debug";..\..\Oem\CsMap\lib80\Debug"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -146,7 +146,7 @@
AdditionalDependencies="ACEd.lib GEOSd.lib csmapd.lib"
OutputFile="$(OutDir)\MgGeometryd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_Wrappers\lib64;"..\..\Oem\geos-2.2.0\VisualStudio\Debug64";..\..\..\MetaCrs\CsMap\lib80\Debug64"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_Wrappers\lib64;"..\..\Oem\geos-2.2.0\VisualStudio\Debug64";..\..\Oem\CsMap\lib80\Debug64"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="..\lib\debug64\MgGeometryd.lib"
@@ -219,7 +219,7 @@
AdditionalDependencies="ACE.lib GEOS.lib csmap.lib"
OutputFile="$(OutDir)\MgGeometry.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;"..\..\Oem\geos-2.2.0\VisualStudio\Release";..\..\..\MetaCrs\CsMap\lib80\Release"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;"..\..\Oem\geos-2.2.0\VisualStudio\Release";..\..\Oem\CsMap\lib80\Release"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -299,7 +299,7 @@
AdditionalDependencies="ACE.lib GEOS.lib csmap.lib"
OutputFile="$(OutDir)\MgGeometry.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_Wrappers\lib64;"..\..\Oem\geos-2.2.0\VisualStudio\Release64";..\..\..\MetaCrs\CsMap\lib80\Release64"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_Wrappers\lib64;"..\..\Oem\geos-2.2.0\VisualStudio\Release64";..\..\Oem\CsMap\lib80\Release64"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp 2010-03-03 00:34:23 UTC (rev 4614)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp 2010-03-03 00:36:32 UTC (rev 4615)
@@ -1098,7 +1098,7 @@
INT32 MgSpatialUtility::PointIsInPolygon (MgCoordinateIterator* polyItr,MgCoordinate* queryPoint)
{
INT32 pointStatus;
- MgCoordinate* outsidePoint;
+ Ptr<MgCoordinate> outsidePoint;
outsidePoint = PointOutsidePolygon (polyItr);
pointStatus = PointIsInPolygon (polyItr,outsidePoint,queryPoint);
Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h 2010-03-03 00:34:23 UTC (rev 4614)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h 2010-03-03 00:36:32 UTC (rev 4615)
@@ -276,7 +276,7 @@
/// Returns an <c>MgCoordinateXY</c> point which is guaranteed to be ooutside
/// the provided polygon.
/// </returns>
- static MgCoordinate* MgSpatialUtility::PointOutsidePolygon (MgCoordinateIterator* polyItr);
+ static MgCoordinate* PointOutsidePolygon (MgCoordinateIterator* polyItr);
///////////////////////////////////////////////////////////////////////////////
/// <summary>
More information about the mapguide-commits
mailing list