The following commit has been merged in the ubuntu/precise branch:
commit eb6bd86e45f06aeec36a5603af03242351ba70ff
Merge: 726684dadf38eab50916a43f3526565de2954311 
bed8af5a5926b4588835a76ef8ed844618d0e4b9
Author: Jerome Villeneuve Larouche <jlarou...@mapgears.com>
Date:   Thu Apr 25 19:26:22 2013 +0000

    Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 0eec455,1a927c3..600cb49
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- geos (3.3.3-2~precise2) precise; urgency=low
++geos (3.3.8-2~precise1) precise; urgency=high
 +
-   * launchpad build for precise
++  * Launchpad build for Precise.
 +
-  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 24 May 2012 
12:15:57 +0000
++ -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 25 Apr 2013 
15:26:05 -0400
++
+ geos (3.3.8-1) unstable; urgency=low
+ 
+   * New Upstream release 3.3.8
+ 
+  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 25 Apr 2013 
14:21:01 -0400
  
  geos (3.3.3-1) unstable; urgency=low
  
diff --combined include/geos/simplify/TaggedLineStringSimplifier.h
index f8f4f82,a9fdc5c..d649ae8
--- a/include/geos/simplify/TaggedLineStringSimplifier.h
+++ b/include/geos/simplify/TaggedLineStringSimplifier.h
@@@ -1,5 -1,5 +1,5 @@@
  /**********************************************************************
-  * $Id: TaggedLineStringSimplifier.h 2958 2010-03-29 11:29:40Z mloskot $
+  * $Id: TaggedLineStringSimplifier.h 3626 2012-05-09 18:02:09Z strk $
   *
   * GEOS - Geometry Engine Open Source
   * http://geos.refractions.net
@@@ -13,7 -13,7 +13,7 @@@
   *
   **********************************************************************
   *
-  * Last port: simplify/TaggedLineStringSimplifier.java rev. 1.8 (JTS-1.7.1)
+  * Last port: simplify/TaggedLineStringSimplifier.java r536 (JTS-1.12+)
   *
   **********************************************************************
   *
@@@ -29,7 -29,6 +29,7 @@@
  #include <cstddef>
  #include <vector>
  #include <memory>
 +#include <cstddef>
  
  #ifdef _MSC_VER
  #pragma warning(push)
@@@ -55,7 -54,6 +55,7 @@@ namespace geos 
  namespace geos {
  namespace simplify { // geos::simplify
  
 +using namespace std;
  
  /** \brief
   * Simplifies a TaggedLineString, preserving topology
@@@ -80,6 -78,12 +80,12 @@@ public
         */
        void setDistanceTolerance(double d);
  
+       /**
+        * Simplifies the given {@link TaggedLineString}
+        * using the distance tolerance specified.
+        *
+        * @param line the linestring to simplify
+        */
        void simplify(TaggedLineString* line);
  
  
@@@ -166,16 -170,3 +172,3 @@@ TaggedLineStringSimplifier::setDistance
  
  #endif // GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
  
- /**********************************************************************
-  * $Log$
-  * Revision 1.3  2006/04/13 21:52:34  strk
-  * Many debugging lines and assertions added. Fixed bug in TaggedLineString 
class.
-  *
-  * Revision 1.2  2006/04/13 10:39:12  strk
-  * Initial implementation of TaggedLinesSimplifier class
-  *
-  * Revision 1.1  2006/04/12 17:19:57  strk
-  * Ported TaggedLineStringSimplifier class, made LineSegment class
-  * polymorphic to fix derivation of TaggedLineSegment
-  *
-  **********************************************************************/
diff --combined src/geomgraph/Node.cpp
index 0ec9ec1,007fe51..fce6b9e
--- a/src/geomgraph/Node.cpp
+++ b/src/geomgraph/Node.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /**********************************************************************
-  * $Id: Node.cpp 3402 2011-07-05 09:43:33Z strk $
+  * $Id: Node.cpp 3613 2012-04-12 09:05:59Z strk $
   *
   * GEOS - Geometry Engine Open Source
   * http://geos.refractions.net
@@@ -26,13 -26,13 +26,14 @@@
  #include <geos/geomgraph/Label.h>
  #include <geos/geomgraph/DirectedEdge.h>
  #include <geos/geom/Location.h>
+ #include <geos/util/IllegalArgumentException.h>
  
  #include <cmath>
  #include <string>
  #include <sstream>
  #include <vector>
  #include <algorithm>
 +#include <cstddef>
  
  #ifndef GEOS_DEBUG
  #define GEOS_DEBUG 0
@@@ -41,13 -41,12 +42,13 @@@
  #define COMPUTE_Z 1
  #endif
  
 -using namespace std;
  using namespace geos::geom;
  
  namespace geos {
  namespace geomgraph { // geos.geomgraph
  
 +using namespace std;
 +
  /*public*/
  Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges)
        :
@@@ -141,7 -140,12 +142,12 @@@ Node::add(EdgeEnd *e
        cerr<<"["<<this<<"] Node::add("<<e->print()<<")"<<endl;
  #endif
        // Assert: start pt of e is equal to node point
-       assert(e->getCoordinate().equals2D(coord));
+       if ( ! e->getCoordinate().equals2D(coord) ) {
+               std::stringstream ss;
+               ss << "EdgeEnd with coordinate " << e->getCoordinate()
+                  << " invalid for node " << coord;
+               throw util::IllegalArgumentException(ss.str());
+   }
  
        // It seems it's legal for edges to be NULL
        // we'd not be honouring the promise of adding

-- 
Geometry engine for Geographic Information Systems

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to