songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
60,472 Commits 3 Branches 156 Tags 970 MiB
Commit Graph

1654 Commits

Author SHA1 Message Date
Laurent Rineau 76cf7e789f Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch' 
- Merge pull request #140 from
  lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau

  Fix for libQGLViewer>=2.6.0

Conflicts:
	Installation/changes.html
 2015-06-28 18:25:04 +02:00
Laurent Rineau ad01608c2c Fix for libQGLViewer>=2.6.0 
Fix #138
 2015-06-26 18:04:25 +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
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
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 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 fae635d2fb Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF 
All Qt4-based demos now use  `-DQT_NO_KEYWORDS`
 2015-05-26 12:32:40 +02:00
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
 2015-05-19 09:07:08 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
 2015-05-19 09:01:20 +02:00
Jane Tournois 83c415bca9 move Mesh_optimization_return_code from Mesh_3 to Mesh_2 
Mesh_3 already depends on Mesh_2,
but not the other way around
 2015-05-19 08:54:36 +02:00
Laurent Rineau 617c8de2c6 Merge pull request #51 from SLopezBRGM/master 
simple fixes to use generic indexes for subdomains and surfacepatches
 2015-05-18 11:03:51 +02:00
Andreas Fabri a4d5f768fb Mesh_3 demo 2015-05-06 16:18:32 +02:00
Andreas Fabri 2f27db0234 changes such that the Mesh_3 demo works with -DQT_NO_KEYWORDS 2015-05-05 12:32:49 +02:00
Sebastien Loriot 53d52b4287 Merge pull request #62 from afabri/CGAL-fix_Index_links-GF 
Escape the word Index with '%'
 2015-04-27 09:26:39 +02:00
Andreas Fabri 52382276a8 Escape the word Index with '%' 2015-04-23 12:04:35 +02:00
Simon 067647eebf Replacing the use of operator!= by !( operator== ) when comparing domain or surface indexes. 
This is link to issue #37.
 2015-04-16 10:12:50 +02:00
Simon bc125c525c This should solve issue #41. 2015-04-14 21:31:18 +02:00
Philipp Möller 49a56c5a79 Fine grained range includes 2015-04-13 17:26:36 +02:00
Philipp Möller 74e71f41e2 Remove uses of Boost.Lambda 
Replace Boost.Lambda with simple loops. The library is not maintained
and no one is going to ever invest in it again. It adds to compile and
preprocessing times without providing safer or shorter code and we can
sacrifice a little bit of readability.
 2015-04-13 17:24:08 +02:00
Philipp Möller 4f8e76b074 Boost.Lambda is not used here anymore 2015-04-13 16:47:00 +02:00
Simon f9e4a9faff Explicitely call the constructor of Surface_patch to prevent compilation failures with g++. 2015-04-12 22:27:44 +02:00
Philipp Möller 370a7da94b Use boost::shared_ptr instead of tr1::shared_ptr 2015-04-10 14:35:20 +02:00
Sébastien Loriot 607929b069 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-16 11:45:08 +01:00
Jane Tournois 0d1087857a int -> size_t + cherrypick 2015-02-12 17:17:28 +01:00
Jane Tournois f4af27a3da reorder variables for initialization 2015-02-06 10:01:41 +01:00
Jane Tournois abfc6d92c8 fix a warning caused by boost::dynamic_bitset<> 2015-02-03 11:20:01 +01:00
Jane Tournois 21082320e3 minimize changes to get warnings, but dynamic_bitset triggers a warning 2015-02-03 11:05:29 +01:00
Jane Tournois a923ae477d fix conversion warnings. meshing_info() is an int here 2015-02-03 10:25:43 +01:00
Jane Tournois b03a656246 this becomes useless because we now backup infinite cells 2015-02-02 15:55:28 +01:00
Jane Tournois c57b9b8840 backup infinite cells for revert_move of perturber 
this is necessary because there can be an infinite cells
among the outdated_cells (with a finite facet f)
that does not share any finite facet with the other cells of
the conflict zone/set of outdated cells.

Therefore the surface info of f cannot be

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-02 15:54:34 +01:00
Laurent Rineau 434766c22b Merge branch 'releases/CGAL-4.5-branch' 
Approved by the Release Manager.
 2015-01-30 11:30:49 +01:00
Laurent Rineau 72e0a3e677 Fix warnings about signed/unsigned 
The code involved is about TBB.
 2015-01-21 12:59:07 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau' 
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:09:20 +01:00
Laurent Rineau 9debd6a471 Merge branch 'CGAL-various_fixes-lrineau' 
s/const static/static const/

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:07:57 +01:00
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
  |
  |     Bug-fix in Mesh_3 with time stamps.
  |
  |     Tested in CGAL-4.5.1-Ic-168.
  |     Approved by the Release Manager.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
  |
  |     Bug fix: a property map was not lightweight.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
  |
  |     Fix the example examples/BGL_triangulation_2/emst.cpp:
  |     the filtered (finite) triangulation was not used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
  |
  |     Fix the SSE macros when MinGW is used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.

Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:05:01 +01:00
Laurent Rineau 21161cc432 The default error_bound for Implicit_mesh_domain_3 was too small 2014-11-28 12:16:14 +01:00
Jane Tournois 78ccd1440f Merge branch 'Mesh_3-fix_integer_overflow-jtournoi' 
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates

fix suggested by a CGAL user
 2014-11-27 12:15:40 +01:00
Laurent Rineau 0c6153ce8c cleanup 
I forgot to remove extra expensive assertions that I have used using the
debugging!

I clean up also a few spaces at end of lines.
 2014-11-27 11:29:52 +01:00
Laurent Rineau 4bdafe6908 Bug-fix in Mesh_3 with time stamps 
That is a follow-up to that commit:
  | commit eefe2012c0
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Thu Oct 2 16:59:19 2014 +0200
  |
  |     Bug-fix in Mesh_3 with time stamps
  |
  |     The implementation of the class template Protect_edges_sizing_field was
  |     not correct when time stamps are used for Vertex_handle. The issue is
  |     that the time stamp of a vertex change when one do:
  |       tr.remove(v);
  |       v = tr.insert(point);
  |     The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
  |     the vertex does change.
  |
The fix was not complete.
 2014-11-26 15:56:37 +01:00
Jane Tournois f59acabc9b avoid using info when casting 2014-11-07 11:19:20 +01:00
Laurent Rineau 2d72cd7f7e Merge branch 'Mesh_3-fix_includes-lrineau' 
Fix missing/surperflous #include

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:59:26 +01:00
Laurent Rineau 768ec1d687 Merge branch 'Polyhedron_demo-fix_warning-lrineau' 
Fix warnings in the Polyhedron demo. The fixes are in Mesh_3,
Min_sphere_or_spheres_d, and in the Polyhedron demo itself.

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:58:09 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
 2014-11-06 10:47:45 +01:00
Laurent Rineau e50820d3fd Fix #include in Mesh_3 
There was missing #include, and surperfuous #include (hard to detect).
 2014-11-05 17:01:28 +01:00
Laurent Rineau 4a8d9077c0 Fix a warning 
Warning from clang:

Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h:1358:25: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare]
 2014-11-03 16:52:51 +01:00
Laurent Rineau f526ebd5cd Merge branch Mesh_3-fix_plugin_interface-cjamin' into releases/CGAL-4.5-branch 
The changes the interface ID declared by
demo/Mesh_3/include/CGAL_demo/Plugin_interface.h, so that the ID of
plugin interface for the Polyedron demo and the Mesh_3 are
different. That will allow to have plugins for both demos in the same
directory.
 2014-10-31 16:40:04 +01:00
Clement Jamin ae0a88708b Fix: a plugin may implement two interfaces 2014-10-29 15:34:01 +01:00
Clement Jamin 72513db3b0 Better console output 2014-10-29 15:14:08 +01:00