e02ac7f7f0
Remove link with zlib (that we introduced before but which are no more required)
2016-06-24 18:35:37 +02:00
10cadcb985
Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD
2016-06-24 17:05:40 +02:00
c951fe0fca
Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF
...
Fix -Wconversion warnings, and issues detected by those warnings
2016-06-24 13:30:48 +02:00
f9dd4b4be7
Try to fix a compilation error with CentOS5's g++
...
The compilation error was:
> ../include/CGAL/Mesh_3/polylines_to_protect.h: In function ‘void CGAL::polylines_to_protect(const CGAL::Image_3&, double, double, double, std::vector<std::vector<IC, std::allocator<_CharT> >, std::allocator<std::vector<IC, std::allocator<_CharT> > > >&, Image_word_type*, Null_subdomain_index, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>, Image_word_type = unsigned char, Null_subdomain_index = CGAL::Null_subdomain_index, PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >, std::allocator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > > >]’:
> ../include/CGAL/Mesh_3/polylines_to_protect.h:538: instantiated from ‘void CGAL::polylines_to_protect(const CGAL::Image_3&, std::vector<std::vector<IC, std::allocator<_CharT> >, std::allocator<std::vector<IC, std::allocator<_CharT> > > >&, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>, Image_word_type = unsigned char, PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >, std::allocator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > > >]’
> ../test/Mesh_3_Examples/mesh_3D_image_with_features.cpp:62: instantiated from here
> ../include/CGAL/Mesh_3/polylines_to_protect.h:193: error: no matching function for call to ‘get(boost::tuples::tuple<boost::array<int, 3ul>, CGAL::Point_3<CGAL::Epick>, unsigned char, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type>&)’
See https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.9-Ic-81/Mesh_3_Examples/TestReport_lrineau_CentOS5.gz
2016-06-23 14:19:24 +02:00
e21ef313c0
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-22 20:54:37 +02:00
378e22aa24
Fix a warning with -DCGAL_NDEBUG
2016-06-22 12:41:26 +02:00
a8af4dad62
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-22 09:43:31 +02:00
e3dc906dfa
Remove duplicated cmake entry.
2016-06-20 12:35:47 +02:00
bbc05a11d9
Fix -Wconversion warnings
...
All conversions are safe.
2016-06-16 16:36:43 +02:00
b95a960058
Minor modifications
...
... after feedback from @afabri.
2016-06-16 15:30:08 +02:00
955e965561
Move code
...
That will fix the initialization of c3t3 from 3D images, in the
Polyhedron demo, with the protection of 1D-features is used, but there
are no 1D-features.
For other use-cases, that does not change anything.
2016-06-16 15:08:36 +02:00
99b646bdd4
Try to fix a warning
...
> include\CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h(192): warning C4244: 'argument': conversion from 'const ptrdiff_t' to 'const unsigned short', possible loss of data
2016-06-16 14:44:05 +02:00
cfb6c060af
Try to fix a warning with MSVC
...
> include\CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h(111): warning C4267: 'argument': conversion from 'size_t' to 'const unsigned short', possible loss of data
2016-06-16 14:44:05 +02:00
b322f53e85
fix a few typos
2016-06-16 12:17:13 +02:00
cc49cd4561
Move the subsubsection to the right subsection
2016-06-15 18:10:15 +02:00
087138274c
Add the pictures
2016-06-15 18:10:15 +02:00
07b2acdd3c
Add the documentation
2016-06-15 18:10:15 +02:00
f87c007402
Add pictures
2016-06-15 18:10:14 +02:00
00d3b9924b
Better random image: a big sphere plus small ones
2016-06-15 18:10:14 +02:00
fa5cb831c9
Add Output_rep<T,F>::is_specialized...
...
.. that allows `Dump_c3t3` to detect if a type can be streamed, using
either `operator<<` or `Output_rep<T>`.
2016-06-15 18:10:14 +02:00
16d18351ce
Add example showing how to initialize components
2016-06-15 18:10:14 +02:00
d2c3683d73
230 max facets is not enough for all seeds
2016-06-14 15:29:42 +02:00
a53f16edac
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-09 19:09:38 +02:00
a5e04dcfd0
Update cmakes to deal with ZLIB in header only mode.
2016-06-09 15:39:56 +02:00
97e122ccb8
Merge pull request #1110 from maxGimeno/Mesh_3_use_split_graph_into_polylines-GF
...
Remove duplicated implementation in <CGAL/Mesh_3/polylines_to_protect.h>
2016-05-31 16:03:16 +02:00
cf15f57a50
Merge pull request #1097 from lrineau/Mesh_3-improve_polylines_to_protect-GF
...
Mesh 3: add an example that protects features of a 3D image
2016-05-31 16:00:58 +02:00
82d613f963
remove height parameter to avoid bad looking result
2016-05-31 15:58:43 +02:00
0f04b4262a
Merge pull request #1109 from lrineau/Mesh_3-change_default_for_edge_size-GF
...
Mesh_criteria_3: change the default for `edge_size` from 0 to +∞
2016-05-31 15:49:16 +02:00
40ff09bd43
Merge pull request #303 from lrineau/Mesh_3-add_remesh_polyhedral_surface-GF
...
Add an example that remeshes a polyhedral surface
2016-05-31 15:43:05 +02:00
bb856cbd63
add missing typename
2016-05-27 17:25:17 +02:00
5770538719
Fix a warning
...
> warning: typedef ‘K’ locally defined but not used [-Wunused-local-typedefs]
2016-05-27 16:47:26 +02:00
cfd76f1b00
Avoid degenerated polylines
2016-05-27 16:46:28 +02:00
33c232ea95
Update the documentation
...
I have taken into account remarks from Andreas Fabri and Jane Tournois.
2016-05-26 17:02:48 +02:00
5b45da6239
boundary edges already are detected by detect_features
...
do not detect and add them twice
and prevent from not-terminating
2016-05-26 17:02:05 +02:00
475d19894c
Removed the file Mesh_3/include/CGAL/internal/Mesh_3/split_in_polylines.h and replaced its usage by CGAL::split_graph_into_polylines.
2016-05-26 16:23:06 +02:00
57b609464e
save the input polyhedra in a vector
...
and implement the derived constructors to be able to detect features in them
2016-05-26 16:15:45 +02:00
46859cfca4
doc : add details
2016-05-26 16:14:01 +02:00
be95730ee2
fix commit c7d614193e
...
I had forgotten 2 constructors
2016-05-26 13:01:30 +02:00
fe67240536
Change the default for `edge_size` from 0 to +∞
...
The previous default value for `CGAL::parameters::edge_size`, in the
constructor of `CGAL::Mesh_criteria_3` was `FT(0)`.
That was in contradiction with the documentation of
[`CGAL::Mesh_criteria_3`][*]:
> Each parameter has a special default value `ignored` which means that
> the corresponding criteria will be ignored.
With `edge_size=0`, the protection of 1D-features is certain to trigger
an assertion or a segmentation fault.
The new default value is now `FT(DBL_MAX)`.
[*]: http://doc.cgal.org/latest/Mesh_3/classCGAL_1_1Mesh__criteria__3.html#ada26edb7ee77aa7279b2ae7e96c56eb0
2016-05-26 12:33:30 +02:00
7c28ed079d
user manual : put the 2 polyhedral examples into the same subsection
2016-05-26 12:18:32 +02:00
cc34901694
document boundaries in Polyhedral_mesh_domain_with_features_3
2016-05-26 12:13:02 +02:00
c7d614193e
move detect_borders inside detect_features
...
and protect its use with a boolean, to avoid doing it twice
2016-05-26 11:54:30 +02:00
04c605cd2c
don't run perturb() and exude() in the surface example
...
perturb and exude are based on quality of dihedral angles so it makes no sense
to run them in this case
2016-05-26 11:53:35 +02:00
9990bfcb52
fix typos
2016-05-26 10:55:17 +02:00
025de85f8b
Fix a warning
...
g++, with `-Wall -Wextra`:
.../include/CGAL/Mesh_3/polylines_to_protect.h:50:28: warning: unused parameter 'k' [-Wunused-parameter]
2016-05-26 09:39:52 +02:00
f969496072
Add the pictures in the documentation.
2016-05-25 17:41:39 +02:00
d6da4ce5b4
Add the subsubsection in the documentation
2016-05-25 17:19:12 +02:00
b3bdee456e
Push another 2×2×2 test image
...
That new image has the case 1-2-1 on one side and the case 2-1-1 on the
other side.
2016-05-25 14:49:09 +02:00
f5677a0639
Update the polylines...
...
...to show that inexact coordinates are allowed for extremities of the
1D-feature inside: vertices of the constructed 1D-features on the
bounding box are snapped to the close vertices of the 1D-features inside
the box.
2016-05-25 14:45:50 +02:00
b8f90e6263
Handle the case 1-2-1 with real arcs
...
Before that, the arcs were each approximated with a polyline of only two
segments. Now they are each approximated with a polyline of 10 segments.
2016-05-25 14:36:36 +02:00
Guillaume Damiand
Sébastien Loriot
Laurent Rineau
Jane Tournois
Sebastien Loriot
Maxime Gimeno