[geos-commits] r3123 - in trunk: . include/geos/operation include/geos/operation/sharedpaths src/operation src/operation/sharedpaths

[svn_geos at osgeo.org]

Author: strk
Date: 2010-11-29 01:33:05 -0800 (Mon, 29 Nov 2010)
New Revision: 3123

Added:
   trunk/include/geos/operation/sharedpaths/Makefile.am
   trunk/src/operation/sharedpaths/Makefile.am
Modified:
   trunk/configure.in
   trunk/include/geos/operation/Makefile.am
   trunk/include/geos/operation/sharedpaths/SharedPathsOp.h
   trunk/src/operation/Makefile.am
   trunk/src/operation/sharedpaths/SharedPathsOp.cpp
Log:
Build sharedpaths lib/namespace

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2010-11-29 09:32:49 UTC (rev 3122)
+++ trunk/configure.in	2010-11-29 09:33:05 UTC (rev 3123)
@@ -433,6 +433,7 @@
 	include/geos/operation/polygonize/Makefile
 	include/geos/operation/predicate/Makefile
 	include/geos/operation/relate/Makefile
+	include/geos/operation/sharedpaths/Makefile
 	include/geos/operation/union/Makefile
 	include/geos/operation/valid/Makefile
 	include/geos/planargraph/Makefile

Modified: trunk/include/geos/operation/Makefile.am
===================================================================
--- trunk/include/geos/operation/Makefile.am	2010-11-29 09:32:49 UTC (rev 3122)
+++ trunk/include/geos/operation/Makefile.am	2010-11-29 09:33:05 UTC (rev 3123)
@@ -11,6 +11,7 @@
     predicate \
     relate \
     union \
+    sharedpaths \
     valid 
 
 #EXTRA_DIST = 

Added: trunk/include/geos/operation/sharedpaths/Makefile.am
===================================================================
--- trunk/include/geos/operation/sharedpaths/Makefile.am	                        (rev 0)
+++ trunk/include/geos/operation/sharedpaths/Makefile.am	2010-11-29 09:33:05 UTC (rev 3123)
@@ -0,0 +1,12 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+#
+#SUBDIRS = 
+
+#EXTRA_DIST = 
+
+geosdir = $(includedir)/geos/operation/sharedpaths
+
+geos_HEADERS = \
+    SharedPathsOp.h 

Modified: trunk/include/geos/operation/sharedpaths/SharedPathsOp.h
===================================================================
--- trunk/include/geos/operation/sharedpaths/SharedPathsOp.h	2010-11-29 09:32:49 UTC (rev 3122)
+++ trunk/include/geos/operation/sharedpaths/SharedPathsOp.h	2010-11-29 09:33:05 UTC (rev 3123)
@@ -20,6 +20,7 @@
 #ifndef GEOS_OPERATION_SHAREDPATHSOP_H
 #define GEOS_OPERATION_SHAREDPATHSOP_H
 
+#include <geos/export.h> // for GEOS_DLL
 
 #include <vector> 
 
@@ -69,10 +70,12 @@
 	///     onto this vector. They'll be of type LineString.
 	///	Ownership of the edges is tranferred.
 	///
-	static void SharedPathsOp(const Geometry& g1, const Geometry& g2,
+	static void getSharedPaths(
+		const geom::Geometry& g1,
+		const geom::Geometry& g2,
 		double tol,
-		std::vector<Geometry*>& sameDirection,
-		std::vector<Geometry*>& oppositeDirection);
+		std::vector<geom::Geometry*>& sameDirection,
+		std::vector<geom::Geometry*>& oppositeDirection);
 
 };
 

Modified: trunk/src/operation/Makefile.am
===================================================================
--- trunk/src/operation/Makefile.am	2010-11-29 09:32:49 UTC (rev 3122)
+++ trunk/src/operation/Makefile.am	2010-11-29 09:33:05 UTC (rev 3123)
@@ -11,6 +11,7 @@
     predicate \
     relate \
     union \
+    sharedpaths \
     valid       
 
 noinst_LTLIBRARIES = liboperation.la
@@ -30,4 +31,5 @@
     predicate/liboppredicate.la \
     relate/liboprelate.la \
     union/libopunion.la \
-    valid/libopvalid.la
+    valid/libopvalid.la \
+    sharedpaths/libopsharedpaths.la

Added: trunk/src/operation/sharedpaths/Makefile.am
===================================================================
--- trunk/src/operation/sharedpaths/Makefile.am	                        (rev 0)
+++ trunk/src/operation/sharedpaths/Makefile.am	2010-11-29 09:33:05 UTC (rev 3123)
@@ -0,0 +1,12 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+#
+SUBDIRS = 
+
+noinst_LTLIBRARIES = libopsharedpaths.la
+
+INCLUDES = -I$(top_srcdir)/include 
+
+libopsharedpaths_la_SOURCES = \
+    SharedPathsOp.cpp 

Modified: trunk/src/operation/sharedpaths/SharedPathsOp.cpp
===================================================================
--- trunk/src/operation/sharedpaths/SharedPathsOp.cpp	2010-11-29 09:32:49 UTC (rev 3122)
+++ trunk/src/operation/sharedpaths/SharedPathsOp.cpp	2010-11-29 09:33:05 UTC (rev 3123)
@@ -17,16 +17,18 @@
  *
  **********************************************************************/
 
-#include <geos/operation/sharedpahts/SharedPathsOp.h>
+#include <geos/operation/sharedpaths/SharedPathsOp.h>
 #include <geos/util/IllegalArgumentException.h>
 
 namespace geos {
 namespace operation { // geos.operation
 namespace sharedpaths { // geos.operation.sharedpaths
 
+using namespace geos::geom;
+
 /* public static */
 void
-SharedPathsOp::SharedPathsOp(const Geometry& g1, const Geometry& g2,
+SharedPathsOp::getSharedPaths(const Geometry& g1, const Geometry& g2,
 		double tol,
 		std::vector<Geometry*>& sameDirection,
 		std::vector<Geometry*>& oppositeDirection)