Commit Graph

48327 Commits

Author SHA1 Message Date
Laurent Rineau ecc0cd8fb9 Fix a LaTeX warning: a figure was a lot too large 2012-06-18 10:27:53 +00:00
Laurent Rineau fd26d4eb2c Remove a warning about duplicate labels 2012-06-18 10:20:50 +00:00
Laurent Rineau 2e80ceff2d Fix a TeX compilation error.
Developers, before merging a candidate feature, please check that *both*
the code test suite and the manual test suite are green.
2012-06-18 10:18:10 +00:00
Laurent Rineau 090b93f229 Fix compilation for MSVC 2012-06-18 09:41:39 +00:00
Eric Berberich b918c8d88d merge from next 2012-06-18 08:37:55 +00:00
Efi Fogel 6edef90b3c updated 2012-06-17 12:20:24 +00:00
Efi Fogel 5b32a7977a updated 2012-06-17 12:19:51 +00:00
Efi Fogel 90843f4d00 1st revision 2012-06-17 12:02:18 +00:00
Efi Fogel 4e4abdd18f 1st revision 2012-06-17 12:01:21 +00:00
Efi Fogel 9cd6a7c106 1st revision 2012-06-17 12:01:07 +00:00
Efi Fogel ffa10ca01e renamed 2012-06-17 11:54:20 +00:00
Efi Fogel 07a0d6a6b3 renamed 2012-06-17 11:53:17 +00:00
Efi Fogel c866f0b7c9 added ric strategy 2012-06-17 11:13:30 +00:00
Laurent Rineau 05b4210bdd merge changes from next 2012-06-15 15:57:39 +00:00
Laurent Rineau 6c240a4ae2 Cleanup: remove unused code. 2012-06-15 15:49:33 +00:00
Laurent Rineau 28c9507c17 Go back to the version of revision 69620. That was faster. 2012-06-15 15:38:45 +00:00
Laurent Rineau 02754f17f9 Revert previous commit for CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h
The code cannot be easily reused because a line does not store
two points but the a, b, c, d coefficients.
2012-06-15 15:27:17 +00:00
Laurent Rineau a3587eabf3 A version with less branches and more numerical computation 2012-06-15 15:12:04 +00:00
Laurent Rineau 41ba29e19a Factorize code of Do_intersect(Bbox_3, <something>)
Uniform use of do_intersect_bbox_segment_aux(..) with various Boolean
template arguments.
2012-06-15 15:06:34 +00:00
Laurent Rineau 1c6ba1851b Factorize code in CGAL/internal/Static_filters/Do_intersect_3.h
The static filters of Do_intersect(BBox_3, Segment_3) and
Do_intersect(BBox_3, Segment_3) now use do_intersect_bbox_segment_aux(..)
from CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h
2012-06-15 14:57:36 +00:00
Laurent Rineau feefea9008 fix a typo in changes.html 2012-06-15 13:06:49 +00:00
Laurent Rineau 627fef95d5 Add the link to notes for CGAL 4.1 2012-06-15 12:11:40 +00:00
Laurent Rineau 108e4e5f16 Update release notes for CGAL 4.0.1 2012-06-15 12:10:48 +00:00
Sébastien Loriot a0588f219f typos 2012-06-15 09:55:26 +00:00
Laurent Rineau e2f2e8d860 Workaround a conflict between Boost>=1.48 and Qt
Just changing the order of includes works around the issue.

The error was:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Surface_mesher_Demo/volume.cpp:10:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Surface_mesher_Demo/./volume.h:61:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/include/CGAL/Implicit_surface_3.h:23:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/include/CGAL/make_surface_mesh.h:23:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/include/CGAL/Surface_mesher_generator.h:24:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/include/CGAL/Surface_mesher/Surface_mesher.h:33:
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-78/include/CGAL/Double_map.h:40:
In file included from /home/lrineau/CGAL/boost/boost-release-branch/boost/bimap.hpp:13:
In file included from /home/lrineau/CGAL/boost/boost-release-branch/boost/bimap/bimap.hpp:61:
In file included from /home/lrineau/CGAL/boost/boost-release-branch/boost/bimap/detail/bimap_core.hpp:43:
In file included from /home/lrineau/CGAL/boost/boost-release-branch/boost/bimap/detail/manage_bimap_key.hpp:26:
In file included from /home/lrineau/CGAL/boost/boost-release-branch/boost/bimap/set_of.hpp:37:
/home/lrineau/CGAL/boost/boost-release-branch/boost/multi_index/ordered_index.hpp:1399:10: error: no member named 'Q_FOREACH' in namespace 'boost'
  boost::foreach::tag)
  ~~~~~~~^
/usr/include/QtCore/qglobal.h:2418:21: note: expanded from macro 'foreach'
#    define foreach Q_FOREACH
                    ^
5 warnings and 1 error generated.
2012-06-15 09:11:49 +00:00
Laurent Rineau 62a502d807 Silent a clang warning
The warning was:
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:272:5: warning: variable 'g' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
    default:
    ^~~~~~~
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:277:19: note: uninitialized use occurs here
    col = Color(r,g,b);
                  ^
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:262:13: note: initialize the variable 'g' to silence this warning
    int r, g, b;
            ^
             = 0
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:272:5: warning: variable 'b' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
    default:
    ^~~~~~~
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:277:21: note: uninitialized use occurs here
    col = Color(r,g,b);
                    ^
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:262:16: note: initialize the variable 'b' to silence this warning
    int r, g, b;
               ^
                = 0
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:272:5: warning: variable 'r' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
    default:
    ^~~~~~~
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:277:17: note: uninitialized use occurs here
    col = Color(r,g,b);
                ^
[...]/CGAL-4.1-Ic-78/include/CGAL/IO/io.h:262:10: note: initialize the variable 'r' to silence this warning
    int r, g, b;
         ^
          = 0
3 warnings generated.
2012-06-15 08:57:41 +00:00
Laurent Rineau a72bd80380 Pass the bbox as argument instead of the six coordinates
That increased the perfs! :-)
2012-06-14 17:04:35 +00:00
Eric Berberich 70fbefe00f fix for QGLViewer or QGLVIEWER (AHHHHHH!) 2012-06-14 16:56:36 +00:00
Laurent Rineau 0119096826 Add a comment that the config test is deprecated and could be removed. 2012-06-14 14:57:19 +00:00
Laurent Rineau b62a301153 Test the undocumented function refine_Delaunay_mesh_2_without_edge_refinement
It seems that OpenSCAD uses that function. It had a compilation error with
g++-4.7 (the patch is already in next).
2012-06-14 13:17:41 +00:00
Sébastien Loriot 5c5abd05f0 make it deterministic 2012-06-14 11:24:55 +00:00
Sébastien Loriot cb0b8a628e add benchmark for cdt2 with intersecting constraints 2012-06-14 10:47:21 +00:00
Philipp Möller b518c4e792 Two more tests for the namespaces. You never know. 2012-06-14 10:39:13 +00:00
Philipp Möller 741cf36606 Add the "rename cpp0x" 2012-06-14 09:21:55 +00:00
Philipp Möller 1bc4a806de Merge branch STL_Extension-rename-cpp0x-pmoeller into next 2012-06-14 09:19:47 +00:00
Philipp Möller ef676f39a8 Add the change in changes.html 2012-06-14 09:13:52 +00:00
Philipp Möller 9f32b687b9 Merge the branch Installation-replace_cfg_macros-pmoeller into next 2012-06-14 09:13:24 +00:00
Laurent Rineau 503d441f1e merge changes from next 2012-06-13 15:51:29 +00:00
Philipp Möller 8720500433 Guard some macros with an additional check against BOOST_VERSION
This will not hinder usability. Compiling a three year old Boost
release with C++11 enabled is a bad idea anyway.
2012-06-13 12:33:33 +00:00
Laurent Rineau 5b78e7fb9d Fix typo: remove an extra '\' 2012-06-13 09:41:39 +00:00
Laurent Rineau c8a14fb91b Remove the deprecated use of Triangulation_euclidean_traits_xy_3
and use Projection_traits_xy_3 instead.
2012-06-13 09:05:33 +00:00
Laurent Rineau 7b5e4e6692 Cancel the renaming of the file terrain.pts
terrain.cpp has been renamed to isl_terrain.cpp, but the data file had not
to be renamed too!
2012-06-12 14:26:55 +00:00
Laurent Rineau c4386798d1 Fix deprecated use of CGAL::Triangulation_euclidean_traits_xy_3
Use CGAL::Projection_traits_xy_3 instead.
2012-06-12 14:25:52 +00:00
Laurent Rineau d92a1b3fff Remove examples/Filtered_kernel/lazykernel.cpp (was in dont_submit)
That example no longer compiles. It was hidden by dont_submit for a long
time, but with a full branch-build (with WITH_demos and WITH_examples
enabled), it is in the way.
2012-06-12 14:12:14 +00:00
Eric Berberich 90e6f6bf0f fix for ZLIB 2012-06-12 12:45:17 +00:00
Philipp Möller fd73696a54 merged ^/branches/next 2012-06-12 12:36:04 +00:00
Philipp Möller 91fb092984 Unused without replacement as it is not used and also not widely
supported yet.
2012-06-12 12:32:57 +00:00
Philipp Möller 04df403fbb merge ^/branches/next 2012-06-12 11:01:59 +00:00
Philipp Möller bb03b1753b template arguments were the wrong way around and copy_n even compiles
when used as copy when the iterators are actually pointers.
2012-06-12 10:59:54 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +00:00