Laurent Rineau
97cd20e8de
Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
...
Fix a bug in CDT_plus_2
2015-06-18 17:31:17 +02:00
Laurent Rineau
22242f69c7
Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
...
Fix a compilation error with gcc44 -std=c++0x
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
2015-06-18 17:31:09 +02:00
Andreas Fabri
c80a9aaa6c
Fix a bug in CDT_plus_2
...
Fix issue #122
2015-06-17 18:52:30 +02:00
Laurent Rineau
b221fd0328
Fix an incoherent indentation
2015-06-17 12:24:01 +02:00
Laurent Rineau
21a699368d
Fix a compilation error with gcc44 -std=c++0x
...
Should fix issue https://github.com/CGAL/cgal/issues/121
The error was that the "domain" class returns a `CGAL::Point_3<K>`, the
triangulation uses `CGAL::Weighted_point<CGAL::Point_3<K>, double>`, and
one piece of code from Mesh_3 in <CGAL/Mesh_3/Refine_facets_3.h> uses an
implicit conversion from
tuple<something_A, something_B, CGAL::Point_3<K> >
to
tuple<something_A, something_B, CGAL::Weighted_point<P, double> >
and plugs that into a `boost::optional`. For some reason, the g++-4.4
compiler does not like that, but recent g++ compilers accept the code.
The fix is to use an explicit conversion from `Point_3` to
`Weighted_point<Point_3, double>`.
2015-06-17 12:21:15 +02:00
Laurent Rineau
b0e0e5fc79
Merge branch 'releases/CGAL-4.6-branch'
...
That merge imports the pull-request:
https://github.com/CGAL/cgal/pull/115
_Emulate mpn_sqr on old versions of GMP_
2015-06-17 12:16:20 +02:00
Simon
7bb2046372
This should solve issue #41 .
...
(cherry picked from commit bc125c525c )
2015-06-17 12:07:51 +02:00
Simon
195f11a98f
Explicitely call the constructor of Surface_patch to prevent compilation failures with g++.
...
(cherry picked from commit f9e4a9faff )
2015-06-17 12:04:13 +02:00
Laurent Rineau
e020872989
Merge two commits forgotten in pull-request #110
...
https://github.com/CGAL/cgal/pull/110
Fixes issue #124 .
https://github.com/CGAL/cgal/issues/124
Merge remote-tracking branch 'cgal-dev/Polyhedron_iostream-Binary_STL_Readder-GF'
2015-06-17 10:20:28 +02:00
Laurent Rineau
5bbd4e8cdb
fix permissions
2015-06-17 10:09:02 +02:00
Laurent Rineau
de7db3ca68
Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle
...
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
2015-06-17 09:59:33 +02:00
Laurent Rineau
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
Laurent Rineau
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
Sebastien Loriot
3c9fbbb393
Merge pull request #110 from afabri/Polyhedron_iostream-Binary_STL_Readder-GF
...
Read binary STL files
2015-06-15 10:01:40 +02:00
Laurent Rineau
f8ffd63077
updated crontab (automated commit)
2015-06-12 19:58:18 +02:00
Aymeric PELLE
72f9d2ccbb
Add tests for backward compatibility.
2015-06-10 23:39:18 +02:00
Laurent Rineau
f5ecd50d62
updated crontab (automated commit)
2015-06-10 18:59:54 +02:00
Sébastien Loriot
96a9b14576
please MSVC10
2015-06-10 17:04:57 +02:00
Sébastien Loriot
4474cb29d5
remove extra typename
2015-06-10 16:26:35 +02:00
Sébastien Loriot
646650be81
disambiguate call to std::sqrt for MSVC10
2015-06-10 16:12:59 +02:00
Aymeric PELLE
dab94dbcb5
Complete copyright years.
2015-06-10 14:11:47 +02:00
Sebastien Loriot
940117422f
Merge pull request #109 from sloriot/Polyhedron_demo-color_each_cc-sloriot
...
add an action to assign a color per cc of a polyhedron
2015-06-10 13:39:31 +02:00
Laurent Rineau
6fc32e43fe
Merge pull request #74 from lrineau/Triangulation_2-fix_projection_traits-GF
...
Fix a bug in Triangulation_2_projection_traits.h and its filtered version
2015-06-10 12:30:29 +02:00
Laurent Rineau
447c5fd2af
Merge pull request #69 from efifogel/MS_2-of_holes-efif
...
Add in `Minvoski_sum_2`:
- handling of polygons with holes,
- the new "reduced convolution" implementation.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Minkowski_sum_2_polygons_with_holes_and_RC
2015-06-10 12:24:00 +02:00
Laurent Rineau
6dc9d60577
Merge pull request #114 from bo0ts/Installation-nodebug_when_testing-pmoeller
...
Remove the -g flag in testsuites (when `RUNNING_CGAL_AUTO_TEST` is `TRUE` in CMake).
2015-06-10 12:02:08 +02:00
Laurent Rineau
8caf689860
Merge pull request #115 from lrineau/Number_types-oldgmp-glisse
...
Fixes a bug: emulate `mpn_sqr` on old versions of GMP (GMP < 4.3.2).
Fixes bug #113
2015-06-10 12:00:42 +02:00
Laurent Rineau
40c629a3b4
Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
...
Add optimizer methods in Mesh_2
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
Laurent Rineau
661ec3f606
Merge pull request #101 from afabri/Ridges_3-BGL-GF
...
Make `Ridge_3` work for any `FaceGraph` (concept from our BGL API).
2015-06-10 11:52:37 +02:00
Aymeric PELLE
7be51168fd
Fix copyright years.
2015-06-10 00:44:56 +02:00
Aymeric PELLE
72c30d6eef
Add copyright info.
2015-06-09 18:44:15 +02:00
Sébastien Loriot
f5837dee87
Disable the normal estimation plugin with Boost-1.57 and C++11
...
Patch similar to
|--------------------------------------------------------------------
| commit bd43545717
| Author: Laurent Rineau <laurent.rineau@cgal.org>
| Date: Mon Jan 26 11:22:09 2015 +0100
|
| Disable the normal estimation plugin with Boost-1.57 and C++11
|--------------------------------------------------------------------
2015-06-09 16:22:19 +02:00
Sébastien Loriot
44b7a2bbc3
float -> double
2015-06-09 10:33:33 +02:00
Andreas Fabri
b46abc8b02
remove argc argv
2015-06-09 08:57:10 +02:00
Andreas Fabri
9c7a335a0b
char* -> const char* to avoid a warning
2015-06-09 08:54:09 +02:00
Aymeric PELLE
6e3e79977b
Include P3TT3.h after declaring Filtered_periodic_predicate.
2015-06-08 17:30:30 +02:00
Sébastien Loriot
cac397d073
remove extra const
2015-06-08 16:36:31 +02:00
Andreas Fabri
0321e244b1
Merge branch 'Ridges_3-BGL-GF-old' into Ridges_3-BGL-GF
...
Conflicts:
Installation/changes.html
2015-06-08 14:36:15 +02:00
Laurent Rineau
648ccb1510
CMake>=2.6.3 is required
...
I have tested: with CMake-2.6.2, there is a configuration error:
CMake Error: Error in cmake code at
/home/lrineau/Git/cgal/Installation/cmake/modules/CGAL_Macros.cmake:213:
Parse error. Function missing ending ")". Instead found left paren with text "(".
With CMake-2.6.3, that works.
2015-06-08 14:09:51 +02:00
Sébastien Loriot
5d02945fc8
try to please Visual Studio 10
2015-06-08 13:44:18 +02:00
Andreas Fabri
053761c350
fix a -strict-ansi warning
...
(cherry picked from commit 307c86910b )
2015-06-08 12:32:45 +02:00
Sébastien Loriot
a2b0267891
increase epsilon bounds
2015-06-08 12:08:08 +02:00
Sébastien Loriot
966f0188b2
force use of std::sqrt
2015-06-08 12:06:23 +02:00
Laurent Rineau
45ee5e9d09
Merge pull request #108 from sloriot/Polyhedron_demo-better_orient_soup-sloriot
...
Before trying to orient a soup, start by removing degenerate polygons
2015-06-08 11:44:19 +02:00
Andreas Fabri
18a4c57f34
int -> std::size_t
2015-06-08 11:29:24 +02:00
Philipp Möller
1ce3c68ec8
Remove the -g flag in testsuites
...
While it might seem cleaner to simply add the -g0 argument, removing -g
is safer: -g0 would need to be added after any possible -g flags. Since
CMake makes no guarantees how the COMPILE_OPTIONS of a target are
actually initialized and we cannot change them on an individual basis
this is not easy to achieve. Hence we strip the CXX_FLAGS of -g. This
also still allows specifying it manually through CGAL_CXX_FLAGS.
2015-06-08 11:17:09 +02:00
Sébastien Loriot
ae5e0efa33
fix warning
2015-06-08 09:56:59 +02:00
Aymeric PELLE
3aeaa24ef7
Alpha_shapes must use P3DTT3 now.
2015-06-05 18:41:12 +02:00
Laurent Rineau
c61663b6ca
Merge branch 'releases/CGAL-4.6-branch'
2015-06-05 16:45:53 +02:00
Laurent Rineau
e9a8f51677
Merge pull request #106 from lrineau/Installation-fix_support_for_gcc_5_and_later-lrineau
...
Add -frounding-math for gcc 4 *and later*
2015-06-05 16:43:27 +02:00
Laurent Rineau
93e6f64245
Merge pull request #99 from afabri/BGL-bugfix_4.6.1_Face_around_face_iterator-GF
...
Fix Face_around_face_iterator
2015-06-05 16:42:58 +02:00