Skip to content
Commits on Source (6)
......@@ -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);
......
......@@ -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}" )
......
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
......
sfcgal (1.3.6-3) UNRELEASED; urgency=medium
sfcgal (1.3.7-1~exp1) experimental; urgency=medium
* New upstream release.
* Drop libegl1-mesa-dev build dependency, issue fixed in mesa 18.2.5-2.
* Bump Standards-Version to 4.3.0, no changes.
* Remove package name from lintian overrides.
* Update symbols for amd64.
* Add lintian overrides for file-references-package-build-path.
-- Bas Couwenberg <sebastic@debian.org> Wed, 21 Nov 2018 07:35:10 +0100
-- Bas Couwenberg <sebastic@debian.org> Mon, 03 Jun 2019 15:13:48 +0200
sfcgal (1.3.6-2) unstable; urgency=medium
......
# Source uses __FILE__ macro
file-references-package-build-path *
# SymbolsHelper-Confirmed: 1.3.6 amd64 armhf i386 m68k mips mipsel powerpc x32
# SymbolsHelper-Confirmed: 1.3.7 amd64
libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
* Build-Depends-Package: libsfcgal-dev
_ZGVN4CGAL10Handle_forINS_8Gmpq_repESaIS1_EE9allocatorE@Base 1.3.1
......@@ -8,7 +8,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZGVN5boost16exception_detail37exception_ptr_static_exception_objectINS0_10bad_alloc_EE1eE@Base 1.3.1
_ZGVN5boost16exception_detail37exception_ptr_static_exception_objectINS0_14bad_exception_EE1eE@Base 1.3.1
_ZGVN5boost4math6detail21min_shift_initializerIdE11initializerE@Base 1.3.1
_ZGVZN4CGAL13Lazy_exact_ntI10__gmp_exprIA1_12__mpq_structS3_EE40relative_precision_of_to_double_internalEvE35relative_precision_of_to_double_ptr@Base 1.3.6
_ZGVZN5boost16exception_detail27get_static_exception_objectINS0_10bad_alloc_EEENS_13exception_ptrEvE2ep@Base 1.3.1
_ZGVZN5boost16exception_detail27get_static_exception_objectINS0_14bad_exception_EEENS_13exception_ptrEvE2ep@Base 1.3.1
_ZGVZN5boost4math6detail19get_min_shift_valueIdEET_vE3val@Base 1.3.6
......@@ -96,12 +95,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
(optional=templinst)_ZN5boost16exception_detail27get_static_exception_objectINS0_14bad_exception_EEENS_13exception_ptrEv@Base 1.3.1
_ZN5boost16exception_detail37exception_ptr_static_exception_objectINS0_10bad_alloc_EE1eE@Base 1.3.1
_ZN5boost16exception_detail37exception_ptr_static_exception_objectINS0_14bad_exception_EE1eE@Base 1.3.1
(optional=templinst)_ZN5boost19thread_specific_ptrIdE11delete_dataD0Ev@Base 1.3.6
(optional=templinst)_ZN5boost19thread_specific_ptrIdE11delete_dataD1Ev@Base 1.3.6
(optional=templinst)_ZN5boost19thread_specific_ptrIdE11delete_dataD2Ev@Base 1.3.6
(optional=templinst)_ZN5boost19thread_specific_ptrIdE11delete_dataclEPv@Base 1.3.6
(optional=templinst)_ZN5boost19thread_specific_ptrIdED1Ev@Base 1.3.6
(optional=templinst)_ZN5boost19thread_specific_ptrIdED2Ev@Base 1.3.6
_ZN5boost2io12format_errorD0Ev@Base 1.3.1
_ZN5boost2io12format_errorD1Ev@Base 1.3.1
_ZN5boost2io12format_errorD2Ev@Base 1.3.1
......@@ -165,12 +158,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
(optional=templinst|arch=amd64)_ZN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEED0Ev@Base 1.3.6
(optional=templinst|arch=amd64)_ZN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEED1Ev@Base 1.3.6
(optional=templinst|arch=amd64)_ZN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEED2Ev@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEE11get_deleterERKSt9type_info@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEE19get_untyped_deleterEv@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEE7disposeEv@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEED0Ev@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEED1Ev@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEED2Ev@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEE11get_deleterERKSt9type_info@Base 1.3.1
(optional=templinst|arch=amd64)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEE17get_local_deleterERKSt9type_info@Base 1.3.6
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEE19get_untyped_deleterEv@Base 1.3.1
......@@ -178,9 +165,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEED0Ev@Base 1.3.1
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEED1Ev@Base 1.3.1
(optional=templinst)_ZN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEED2Ev@Base 1.3.1
_ZN5boost9exceptionD0Ev@Base 1.3.6
_ZN5boost9exceptionD1Ev@Base 1.3.6
_ZN5boost9exceptionD2Ev@Base 1.3.6
_ZN6SFCGAL2io12osgWriteFileERKNS_8GeometryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.3.1
_ZN6SFCGAL2io13toOsgGeometryERKNS_8GeometryE@Base 1.3.1
_ZN6SFCGAL6detail2io10OsgFactory12createVertexEPN3osg13TemplateArrayINS3_5Vec3fELNS3_5Array4TypeE28ELi3ELi5126EEERKNS_5PointE@Base 1.3.1
......@@ -258,11 +242,8 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
(optional=templinst)_ZNSaIN4CGAL10Handle_forINS_9Gmpfr_repESaIS1_EE10RefCountedEED2Ev@Base 1.3.1
(optional=templinst)_ZNSaIN4CGAL10Handle_forINS_9Gmpzf_repESaIS1_EE10RefCountedEED1Ev@Base 1.3.1
(optional=templinst)_ZNSaIN4CGAL10Handle_forINS_9Gmpzf_repESaIS1_EE10RefCountedEED2Ev@Base 1.3.1
(optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESA_EET0_T_SC_SB_@Base 1.3.6
(optional=templinst|subst)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEE{size_t}S9_EET_SB_T0_RKT1_@Base 1.3.5
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 1.3.1
(optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 1.3.1
(optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 1.3.6
(optional=templinst|arch=amd64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 1.3.6
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_assignEjRKS7_@Base 1.3.1
(optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_assignEmRKS7_@Base 1.3.1
......@@ -270,7 +251,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
(optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_@Base 1.3.1
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratorjb@Base 1.3.1
(optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb@Base 1.3.1
(optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EERKj@Base 1.3.6
(optional=templinst|arch=amd64)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 1.3.6
(optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 1.3.5
(optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag@Base 1.3.5
......@@ -301,7 +281,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTIN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEE@Base 1.3.1
_ZTIN5boost16exception_detail20error_info_containerE@Base 1.3.1
_ZTIN5boost16exception_detail25error_info_container_implE@Base 1.3.1
_ZTIN5boost19thread_specific_ptrIdE11delete_dataE@Base 1.3.6
_ZTIN5boost2io12format_errorE@Base 1.3.1
_ZTIN5boost2io12too_few_argsE@Base 1.3.1
_ZTIN5boost2io13too_many_argsE@Base 1.3.1
......@@ -314,9 +293,7 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTIN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_10bad_alloc_EEEEE@Base 1.3.1
_ZTIN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_14bad_exception_EEEEE@Base 1.3.1
(arch=amd64)_ZTIN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEEE@Base 1.3.6
_ZTIN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEEE@Base 1.3.6
_ZTIN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEEE@Base 1.3.1
_ZTIN5boost6detail20tss_cleanup_functionE@Base 1.3.6
_ZTIN5boost9exceptionE@Base 1.3.1
_ZTSN3osg11MixinVectorINS_5Vec3fEEE@Base 1.3.1
_ZTSN3osg11MixinVectorIjEE@Base 1.3.1
......@@ -339,7 +316,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTSN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEE@Base 1.3.1
_ZTSN5boost16exception_detail20error_info_containerE@Base 1.3.1
_ZTSN5boost16exception_detail25error_info_container_implE@Base 1.3.1
_ZTSN5boost19thread_specific_ptrIdE11delete_dataE@Base 1.3.6
_ZTSN5boost2io12format_errorE@Base 1.3.1
_ZTSN5boost2io12too_few_argsE@Base 1.3.1
_ZTSN5boost2io13too_many_argsE@Base 1.3.1
......@@ -347,14 +323,11 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTSN5boost2io18basic_altstringbufIcSt11char_traitsIcESaIcEEE@Base 1.3.1
_ZTSN5boost2io22basic_oaltstringstreamIcSt11char_traitsIcESaIcEE5No_OpE@Base 1.3.1
_ZTSN5boost2io22basic_oaltstringstreamIcSt11char_traitsIcESaIcEEE@Base 1.3.1
_ZTSN5boost6detail14do_heap_deleteINS_19thread_specific_ptrIdE11delete_dataEEE@Base 1.3.6
_ZTSN5boost6detail15sp_counted_baseE@Base 1.3.1
_ZTSN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_10bad_alloc_EEEEE@Base 1.3.1
_ZTSN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_14bad_exception_EEEEE@Base 1.3.1
(arch=amd64)_ZTSN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEEE@Base 1.3.6
_ZTSN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEEE@Base 1.3.6
_ZTSN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEEE@Base 1.3.1
_ZTSN5boost6detail20tss_cleanup_functionE@Base 1.3.6
_ZTSN5boost9exceptionE@Base 1.3.1
_ZTTN5boost16exception_detail10clone_implIN6SFCGAL9ExceptionEEE@Base 1.3.1
_ZTTN5boost16exception_detail10clone_implINS0_10bad_alloc_EEE@Base 1.3.1
......@@ -381,7 +354,6 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTVN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEEE@Base 1.3.1
_ZTVN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEE@Base 1.3.1
_ZTVN5boost16exception_detail25error_info_container_implE@Base 1.3.1
_ZTVN5boost19thread_specific_ptrIdE11delete_dataE@Base 1.3.6
_ZTVN5boost2io12format_errorE@Base 1.3.1
_ZTVN5boost2io12too_few_argsE@Base 1.3.1
_ZTVN5boost2io13too_many_argsE@Base 1.3.1
......@@ -391,11 +363,9 @@ libSFCGAL-osg.so.1 #PACKAGE# #MINVER#
_ZTVN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_10bad_alloc_EEEEE@Base 1.3.1
_ZTVN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_14bad_exception_EEEEE@Base 1.3.1
(arch=amd64)_ZTVN5boost6detail17sp_counted_impl_pINS_16exception_detail15error_info_baseEEE@Base 1.3.6
_ZTVN5boost6detail18sp_counted_impl_pdIPNS_19thread_specific_ptrIdE11delete_dataENS0_14do_heap_deleteIS4_EEEE@Base 1.3.6
_ZTVN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEEE@Base 1.3.1
_ZTVN5boost9exceptionE@Base 1.3.1
(arch=amd64)_ZZN4CGAL13Lazy_exact_ntI10__gmp_exprIA1_12__mpq_structS3_EE40relative_precision_of_to_double_internalEvE31relative_precision_of_to_double@Base 1.3.6
_ZZN4CGAL13Lazy_exact_ntI10__gmp_exprIA1_12__mpq_structS3_EE40relative_precision_of_to_double_internalEvE35relative_precision_of_to_double_ptr@Base 1.3.6
(optional=templinst)_ZZN5boost16exception_detail27get_static_exception_objectINS0_10bad_alloc_EEENS_13exception_ptrEvE2ep@Base 1.3.1
(optional=templinst)_ZZN5boost16exception_detail27get_static_exception_objectINS0_14bad_exception_EEENS_13exception_ptrEvE2ep@Base 1.3.1
(optional=templinst)_ZZN5boost4math6detail19get_min_shift_valueIdEET_vE3val@Base 1.3.6
......
......@@ -2,3 +2,6 @@
# Fortify Source functions: no, only unprotected functions found!
hardening-no-fortify-functions usr/lib/*/libSFCGAL.so.*
# Source uses __FILE__ macro
file-references-package-build-path *
This diff is collapsed.
......@@ -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 );
/**
......
......@@ -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>
/**
......
......@@ -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 ) ) );
}
}
......