[geos-commits] r3982 - in branches/3.4: . src/algorithm src/geom src/io src/operation/buffer

[svn_geos at osgeo.org]

Author: mloskot
Date: 2014-05-08 02:50:43 -0700 (Thu, 08 May 2014)
New Revision: 3982

Modified:
   branches/3.4/
   branches/3.4/NEWS
   branches/3.4/nmake.opt
   branches/3.4/src/algorithm/LineIntersector.cpp
   branches/3.4/src/geom/LineSegment.cpp
   branches/3.4/src/io/WKTWriter.cpp
   branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp
Log:
Merged revision(s) 3981 from trunk:
Apply minimal changes to enable building with Visual Studio 2013 (Ticket #691)



Property changes on: branches/3.4
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:3981

Modified: branches/3.4/NEWS
===================================================================
--- branches/3.4/NEWS	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/NEWS	2014-05-08 09:50:43 UTC (rev 3982)
@@ -6,6 +6,7 @@
  - Throw a ParseException on missing chars from HEXWKB string (#675)
  - Fix ruby binding build (https://github.com/libgeos/libgeos/pull/32)
  - Make polygonize operation interruptable
+ - Update for Visual Studio 2013 (#691)
 
 Changes in 3.4.2
 2013-08-25

Modified: branches/3.4/nmake.opt
===================================================================
--- branches/3.4/nmake.opt	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/nmake.opt	2014-05-08 09:50:43 UTC (rev 3982)
@@ -120,6 +120,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "11.00.60610.1"
 GEOS_MSVC = 11.0
 GEOS_MSC = 1700
+!ELSEIF "$(_NMAKE_VER)" == "12.00.21005.1"
+GEOS_MSVC = 12.0
+GEOS_MSC = 1800
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0

Modified: branches/3.4/src/algorithm/LineIntersector.cpp
===================================================================
--- branches/3.4/src/algorithm/LineIntersector.cpp	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/src/algorithm/LineIntersector.cpp	2014-05-08 09:50:43 UTC (rev 3982)
@@ -29,6 +29,7 @@
 //#include <geos/util/Assert.h> // changed to TopologyException
 //#include <geos/util/TopologyException.h> // we don't throw anymore
 
+#include <algorithm> // for max()
 #include <string>
 #include <cmath> // for fabs()
 #include <cassert> 
@@ -125,7 +126,7 @@
 		// <FIX>
 		// hack to ensure that non-endpoints always have a non-zero distance
 		if (dist == 0.0 && !(p==p0)) {
-			dist=max(pdx,pdy);
+			dist=(std::max)(pdx,pdy);
 		}
 	}
 	assert(!(dist == 0.0 && !(p==p0))); // Bad distance calculation

Modified: branches/3.4/src/geom/LineSegment.cpp
===================================================================
--- branches/3.4/src/geom/LineSegment.cpp	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/src/geom/LineSegment.cpp	2014-05-08 09:50:43 UTC (rev 3982)
@@ -32,6 +32,7 @@
 #include <geos/profiler.h>
 #include <geos/inline.h>
 
+#include <algorithm> // for max
 #include <sstream>
 #include <cmath>
 
@@ -168,10 +169,10 @@
 	int orient1 = algorithm::CGAlgorithms::orientationIndex(p0, p1, seg.p1);
 	// this handles the case where the points are L or collinear
 	if (orient0 >= 0 && orient1 >= 0)
-		return max(orient0, orient1);
+		return (std::max)(orient0, orient1);
 	// this handles the case where the points are R or collinear
 	if (orient0 <= 0 && orient1 <= 0)
-		return max(orient0, orient1);
+        return (std::max)(orient0, orient1);
 	// points lie on opposite sides ==> indeterminate orientation
 	return 0;
 }

Modified: branches/3.4/src/io/WKTWriter.cpp
===================================================================
--- branches/3.4/src/io/WKTWriter.cpp	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/src/io/WKTWriter.cpp	2014-05-08 09:50:43 UTC (rev 3982)
@@ -33,6 +33,7 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/util/IllegalArgumentException.h>
 
+#include <algorithm> // for min
 #include <typeinfo>
 #include <cstdio> // should avoid this
 #include <string>
@@ -179,7 +180,7 @@
 WKTWriter::appendGeometryTaggedText(const Geometry *geometry, int level,
 		Writer *writer)
 {
-  outputDimension = min( defaultOutputDimension,
+  outputDimension = (std::min)( defaultOutputDimension,
                          geometry->getCoordinateDimension() );
 
   indent(level, writer);

Modified: branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp
===================================================================
--- branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp	2014-05-07 17:32:22 UTC (rev 3981)
+++ branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp	2014-05-08 09:50:43 UTC (rev 3982)
@@ -37,6 +37,7 @@
 #include <geos/geomgraph/Label.h>
 #include <geos/noding/NodedSegmentString.h>
 
+#include <algorithm> // for min
 #include <cmath>
 #include <cassert>
 #include <memory>