[mapguide-commits] r4647 - in trunk/MgDev/Common: CoordinateSystem Geometry/Spatial Stylization

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2010-03-10 14:49:58 -0500 (Wed, 10 Mar 2010)
New Revision: 4647

Modified:
   trunk/MgDev/Common/CoordinateSystem/ArbitraryCoordsys.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h
   trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
   trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
Log:
Minor cleanup:
- where possible use _WIN32 and not WIN32
- remove unused variable in MgSpatialUtility::PointOutsidePolygon


Modified: trunk/MgDev/Common/CoordinateSystem/ArbitraryCoordsys.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/ArbitraryCoordsys.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/CoordinateSystem/ArbitraryCoordsys.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -24,7 +24,7 @@
 
 extern "C" struct cs_Unittab_ cs_Unittab[]; // Mentor unit table
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dlfcn.h>
 #endif
 

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -35,7 +35,7 @@
 #pragma message( "******************************************************************" )
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dlfcn.h>
 #endif
 

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysEnumInteger32.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysEnumInteger32.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -159,7 +159,7 @@
             continue;
         }
         wchar_t wszINT32[255];
-        #ifdef WIN32
+        #ifdef _WIN32
         _itow(m_pnValues[m_ulPos], wszINT32, 10);
         #else
         swprintf(wszINT32, 255, L"%d", m_pnValues[m_ulPos]);

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -25,7 +25,7 @@
 
 using namespace CSLibrary;
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifdef GEOMETRY_EXPORTS
 #    define MG_GEOMETRY_API __declspec(dllexport)
 #else

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h	2010-03-10 19:49:58 UTC (rev 4647)
@@ -28,11 +28,11 @@
 
 #include <algorithm>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "windows.h"
 // To undefine GetMessage macro defined in windows
 #undef GetMessage
-#endif // WIN32 defined
+#endif
 
 // Mentor specific information
 extern "C" struct cs_Prjtab_ cs_Prjtab[];   // Mentor projection table

Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -1028,7 +1028,6 @@
 MgCoordinate* MgSpatialUtility::PointOutsidePolygon (MgCoordinateIterator* polyItr)
 {
     Ptr<MgCoordinate> outPoint;
-    Ptr<MgCoordinate> tmpCoord;
 
     double outX, outY;
     double magnitude;
@@ -1326,7 +1325,7 @@
                        MgSpatialUtilityStatus::IntersectIsSeg1End;
                 if ((status & mask) == 0)
                 {
-//TODO: A performance improvement is possibile here.  Since this transition
+// TODO: A performance improvement is possible here.  Since this transition
 // point is an intersection point, we know it to reside on the boundary.  We
 // could set the M value to indicate that and eliminate the need to determine
 // this point's status in Phase Two.  We'll do this after we know all this
@@ -1377,7 +1376,7 @@
                 if (collinearStatus == seg1StartA || collinearStatus == seg1StartB || collinearStatus == seg1Both)
                 {
                     // Insert the polygon "From" point.
-//TODO: A performance improvement is possibile here.  Since this transition
+// TODO: A performance improvement is possible here.  Since this transition
 // point is an intersection point, we know it to reside on the boundary.  We
 // could set the M value to indicate that and eliminate the need to determine
 // this point's status in Phase Two.  We'll do this after we know all this
@@ -1390,7 +1389,7 @@
                 if (collinearStatus == seg1EndA || collinearStatus == seg1EndB || collinearStatus == seg1Both)
                 {
                     // Insert the polygon "To" point.
-//TODO: A performance improvement is possibile here.  Since this transition
+// TODO: A performance improvement is possible here.  Since this transition
 // point is an intersection point, we know it to reside on the boundary.  We
 // could set the M value to indicate that and eliminate the need to determine
 // this point's status in Phase Two.  We'll do this after we know all this

Modified: trunk/MgDev/Common/Stylization/ExpressionHelper.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/ExpressionHelper.cpp	2010-03-10 01:49:10 UTC (rev 4646)
+++ trunk/MgDev/Common/Stylization/ExpressionHelper.cpp	2010-03-10 19:49:58 UTC (rev 4647)
@@ -43,7 +43,7 @@
 
     // common functions
     RS_FeatureClassInfo* featInfo = renderer? renderer->GetFeatureClassInfo() : NULL;
-    const RS_String& featCls = (featInfo != NULL)?  featInfo->name() : s_Empty;
+    const RS_String& featCls = (featInfo != NULL)? featInfo->name() : s_Empty;
 
     FdoPtr<ExpressionFunctionArgb> funcArgb = ExpressionFunctionArgb::Create();
     FdoPtr<ExpressionFunctionDecap> funcDecap = ExpressionFunctionDecap::Create();