[geos-commits] r3172 - in trunk: include/geos/geom/util src/geom/util

[svn_geos at osgeo.org]

Author: strk
Date: 2011-02-02 09:57:11 -0800 (Wed, 02 Feb 2011)
New Revision: 3172

Modified:
   trunk/include/geos/geom/util/GeometryCombiner.h
   trunk/src/geom/util/GeometryCombiner.cpp
Log:
Check GeometryCombiner against JTS-1.12

Modified: trunk/include/geos/geom/util/GeometryCombiner.h
===================================================================
--- trunk/include/geos/geom/util/GeometryCombiner.h	2011-02-02 17:41:29 UTC (rev 3171)
+++ trunk/include/geos/geom/util/GeometryCombiner.h	2011-02-02 17:57:11 UTC (rev 3172)
@@ -4,14 +4,19 @@
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
  *
- * Copyright (C) 2006 Refractions Research Inc.
+ * Copyright (C) 2006-2011 Refractions Research Inc.
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU Lesser General Public Licence as published
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/util/GeometryCombiner.java r320 (JTS-1.12)
+ *
  **********************************************************************/
+
 #ifndef GEOS_GEOM_UTIL_GEOMETRYCOMBINER_H
 #define GEOS_GEOM_UTIL_GEOMETRYCOMBINER_H
 
@@ -35,8 +40,8 @@
  * Input geometries which are already collections
  * will have their elements extracted first.
  * No validation of the result geometry is performed.
- * (The only case where invalidity is possible is where {@link Polygonal} geometries
- * are combined and result in a self-intersection).
+ * (The only case where invalidity is possible is where {@link Polygonal}
+ * geometries are combined and result in a self-intersection).
  * 
  * @see GeometryFactory#buildGeometry
  */

Modified: trunk/src/geom/util/GeometryCombiner.cpp
===================================================================
--- trunk/src/geom/util/GeometryCombiner.cpp	2011-02-02 17:41:29 UTC (rev 3171)
+++ trunk/src/geom/util/GeometryCombiner.cpp	2011-02-02 17:57:11 UTC (rev 3172)
@@ -4,13 +4,17 @@
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
  *
- * Copyright (C) 2006 Refractions Research Inc.
+ * Copyright (C) 2006-2011 Refractions Research Inc.
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU Lesser General Public Licence as published
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/util/GeometryCombiner.java r320 (JTS-1.12)
+ *
  **********************************************************************/
 
 #include <geos/geom/util/GeometryCombiner.h>