[Git][debian-gis-team/sfcgal][upstream] New upstream version 1.3.7

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / sfcgal


Commits:
4cea53b1 by Bas Couwenberg at 2019-06-03T13:10:40Z
New upstream version 1.3.7
- - - - -


6 changed files:

- CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h
- CMakeLists.txt
- NEWS
- src/capi/sfcgal_c.h
- src/config.h.cmake
- src/detail/triangulate/ConstraintDelaunayTriangulation.cpp


Changes:

=====================================
CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h
=====================================
@@ -27,7 +27,11 @@
 
 //TODO rename this file when doing proper integration
 #include <CGAL/internal/corefinement/Polyhedron_constness_types.h>
+#if CGAL_VERSION_NR < 1041401000 // version 4.14
 #include <CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h>
+#else
+#include <CGAL/Intersections_3/Segment_3_Triangle_3.h>
+#endif
 namespace CGAL{
 namespace internal_IOP{
 
@@ -153,7 +157,11 @@ do_intersect(typename Polyhedron_types<Polyhedron,Is_const>::Halfedge_handle hh,
       // the segment is coplanar with the triangle's supporting plane
       // we test whether the segment intersects the triangle in the common 
       // supporting plane
+#if CGAL_VERSION_NR < 1041401000 // version 4.14
       if ( ::CGAL::internal::do_intersect_coplanar(a,b,c,p,q,Kernel()) )
+#else
+      if ( ::CGAL::Intersections::internal::do_intersect_coplanar(a,b,c,p,q,Kernel()) )
+#endif
         return Intersection_result(COPLNR,Intersection_info(),true,true);
       return Intersection_result(EMPTY,Intersection_info(),true,true);
       


=====================================
CMakeLists.txt
=====================================
@@ -25,7 +25,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules;${CMAKE_MODULE_PATH}"
 
 set( SFCGAL_VERSION_MAJOR 1 )
 set( SFCGAL_VERSION_MINOR 3 )
-set( SFCGAL_VERSION_PATCH 6 )
+set( SFCGAL_VERSION_PATCH 7 )
 
 set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" )
 


=====================================
NEWS
=====================================
@@ -1,3 +1,7 @@
+1.3.7 (2019-06-03):
+    * Fix compilation with CGAL 4.14 (fix #188, path by Sebastien Loriot)
+    * Build Triangulation even with intersecting constraint edges (Patch by Darafei Praliaskouski)
+    * Fix C API headers (Patch by Matthieu Viry)
 1.3.6 (2018-11-12):
     * Get rid of boost data_time dependency
     * Fix some implicit switch/case fallthroughs


=====================================
src/capi/sfcgal_c.h
=====================================
@@ -471,7 +471,7 @@ SFCGAL_API const sfcgal_geometry_t*  sfcgal_solid_shell_n( const sfcgal_geometry
  * @post the ownership of the shell is taken. The caller is not responsible anymore of its deallocation
  * @ingroup capi
  */
-SFCGAL_API void                      sfcgal_solid_add_shell( sfcgal_geometry_t* solid, sfcgal_geometry_t* shell );
+SFCGAL_API void                      sfcgal_solid_add_interior_shell( sfcgal_geometry_t* solid, sfcgal_geometry_t* shell );
 
 
 /**


=====================================
src/config.h.cmake
=====================================
@@ -20,6 +20,9 @@
 #ifndef _SFCGAL_CONFIG_H_
 #define _SFCGAL_CONFIG_H_
 
+#define CGAL_DO_NOT_USE_BOOST_MP 1
+#define CGAL_DO_NOT_USE_GMPXX 1
+
 #include <SFCGAL/export.h>
 
 /**


=====================================
src/detail/triangulate/ConstraintDelaunayTriangulation.cpp
=====================================
@@ -145,14 +145,9 @@ void ConstraintDelaunayTriangulation::getTriangles( TriangulatedSurface& triangu
 
         const Coordinate& c = it->vertex( 2 )->info().original ;
 
-        // check that vertex has an original vertex
-        if ( a.isEmpty() || b.isEmpty() || c.isEmpty() ) {
-            BOOST_THROW_EXCEPTION( Exception(
-                                       ( boost::format( "Can't convert Triangulation to TriangulatedSurface (constraint intersection found)" ) ).str()
-                                   ) ) ;
+        if ( !a.isEmpty() &&  !b.isEmpty() && !c.isEmpty() ) {
+            triangulatedSurface.addTriangle( new Triangle( Point( a ), Point( b ), Point( c ) ) );
         }
-
-        triangulatedSurface.addTriangle( new Triangle( Point( a ), Point( b ), Point( c ) ) );
     }
 }
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/commit/4cea53b19454be135c85e46edb3bbca220956313

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/commit/4cea53b19454be135c85e46edb3bbca220956313
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190603/6b94bd2e/attachment-0001.html>