Commit Graph

47953 Commits

Author SHA1 Message Date
Laurent Rineau eef769cf9a Fix Do_intersect_3(Bbox_3, Segment_3)
svn merge --reintegrate \^/branches/features/Intersection_3-fix_do_intersect_bbox_segment-lrineau
2012-06-25 08:37:32 +00:00
Laurent Rineau 57ffa4fe02 updated crontab (automated commit) 2012-06-25 08:18:02 +00:00
Philipp Möller caf3cce0d1 Silence unused parameter warnings. Leave the ones from the test-suite
that could signal incomplete tests.
2012-06-22 14:22:16 +00:00
Philipp Möller 67fdbf93d1 Prevent spurious warning in the test-suite. Leave the one that is
actually suspicious.
2012-06-22 11:52:14 +00:00
Philipp Möller 6735bd47a4 Remove include overkill. 2012-06-22 10:43:25 +00:00
Philipp Möller 811daa2ad4 Silence unused parameter warnings when building. 2012-06-22 10:05:26 +00:00
Eric Berberich 026474363b revert comit in wrong branch 2012-06-22 09:55:07 +00:00
Philipp Möller 491ab8f939 Remove three unused private fields. 2012-06-22 09:52:10 +00:00
Laurent Rineau aab32c4734 updated crontab (automated commit) 2012-06-22 08:18:03 +00:00
Eric Berberich 0740f2bbc8 preconfig style 2012-06-21 23:21:31 +00:00
Sébastien Loriot feb507b15f changelog for 69918 2012-06-21 14:08:01 +00:00
Laurent Rineau 0aba4d0010 Fix the parsing of the VERSION file
In case of a build from a release tarball, the parsing of the VERSION file
was not correct. This patch tries a better solution.
2012-06-21 10:34:46 +00:00
Laurent Rineau a8f332ad20 update 2012-06-21 08:43:00 +00:00
Sébastien Loriot 75e696a251 BUGFIX: Eigen solvers are now non-copyable 2012-06-20 16:11:50 +00:00
Pierre Alliez ab1c5899e1 shut up warnings 2012-06-20 13:32:44 +00:00
Philipp Möller 91dbadcf7d Drop an unused variable. 2012-06-20 11:54:28 +00:00
Philipp Möller d8270400a2 Added some missing 'template' keywords to member function calls, that
gcc and MSVC silently swallowed.
2012-06-20 11:05:59 +00:00
Laurent Rineau 19ab08d6e9 Fix a warning from clang
The warning was:

[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:353:9: warning: variable 'b' is used uninitialized whenever '||' condition is true [-Wsometimes-uninitialized]
    if( (px == qx) || // <=> (dmin == 0)
        ^~~~~~~~~~
[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:408:12: note: in instantiation of function template specialization 'CGAL::internal::do_intersect_bbox_segment_aux<float, true, true, false>' requested here
    return do_intersect_bbox_segment_aux<FT, true, true, false>(
           ^
[...]/include/CGAL/Kernel/function_objects.h:2052:14: note: in instantiation of function template specialization 'CGAL::internal::do_intersect<CGAL::Simple_cartesian<float> >' requested here
    { return internal::do_intersect(t1, t2, K()); }
             ^
[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:428:10: note: in instantiation of function template specialization 'CGAL::CommonKernelFunctors::Do_intersect_3<CGAL::Simple_cartesian<float> >::operator()<CGAL::Segment_3<CGAL::Simple_cartesian<float>>, CGAL::Bbox_3>' requested here
  return typename K::Do_intersect_3()(segment, bbox);
         ^
[...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Intersections_3/bbox_other_do_intersect_test.cpp:67:12: note: in instantiation of function template specialization 'CGAL::do_intersect<CGAL::Simple_cartesian<float> >' requested here
  bool b = CGAL::do_intersect(t,bbox);
           ^
[...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Intersections_3/bbox_other_do_intersect_test.cpp:416:12: note: in instantiation of function template specialization 'test_aux<CGAL::Segment_3<CGAL::Simple_cartesian<float>> >' requested here
  bool b = test_aux(s12,"s12",bbox,false);
           ^
[...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Intersections_3/bbox_other_do_intersect_test.cpp:665:12: note: in instantiation of function template specialization 'test<CGAL::Simple_cartesian<float> >' requested here
  bool b = test<K>(exact_predicates) &&
           ^
[...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Intersections_3/bbox_other_do_intersect_test.cpp:678:7: note: in instantiation of function template specialization 'test_kernel<CGAL::Simple_cartesian<float> >' requested here
  b = test_kernel<CGAL::Simple_cartesian<float> >(false);
      ^
[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:360:25: note: uninitialized use occurs here
    if(is_indeterminate(b)) return b; // Note that the default-constructed
                        ^
[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:353:9: note: remove the '||' if its condition is always false
    if( (px == qx) || // <=> (dmin == 0)
        ^~~~~~~~~~~~~
[...]/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h:351:23: note: initialize the variable 'b' to silence this warning
    Is_greater_value b;
                      ^
                       = false
2012-06-20 10:32:46 +00:00
Philipp Möller ea6635c86d Include the header with the declaration so that the declaration with
the attribute precedes the definition.
2012-06-20 10:20:27 +00:00
Laurent Rineau 69ef17087e Fix a warning of clang
The warning was:


In file included from [...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Algebraic_foundations/Chinese_remainder_traits.cpp:34:
In file included from [...]/include/CGAL/Polynomial.h:44:
In file included from [...]/include/CGAL/Flattening_iterator.h:24:
In file included from [...]/include/CGAL/Nested_iterator.h:29:
[...]/include/CGAL/iterator.h:1240:10: warning: class template 'Derivator' was previously declared as a struct template [-Wmismatched-tags]
  friend class internal::Derivator;
         ^
[...]/include/CGAL/iterator.h:1193:8: note: previous use is here
struct Derivator
       ^
[...]/include/CGAL/iterator.h:1240:10: note: did you mean struct here?
  friend class internal::Derivator;
         ^~~~~
         struct
[...]/include/CGAL/iterator.h:1299:10: warning: class template 'Derivator' was previously declared as a struct template [-Wmismatched-tags]
  friend class internal::Derivator;
         ^
[...]/include/CGAL/iterator.h:1193:8: note: previous use is here
struct Derivator
       ^
[...]/include/CGAL/iterator.h:1299:10: note: did you mean struct here?
  friend class internal::Derivator;
         ^~~~~
         struct
2 warnings generated.
2012-06-20 10:18:05 +00:00
Laurent Rineau eecf1e94be Fix for MSVC: protect the CGAL::max calls to prevent macro substitution 2012-06-20 09:53:56 +00:00
Philipp Möller 5f6b09c484 Fix types of loop counters to size_t. 2012-06-20 09:15:34 +00:00
Laurent Rineau 1404d27c5e updated crontab (automated commit) 2012-06-19 12:18:03 +00:00
Laurent Rineau 23ab39f2df Remove calls to CGAL::abs for Ray_3 and Segment_3
As t1 and t2 are, by construction, greater than 0, for rays and segments,
no need to call CGAL::abs on t[xyz]min and t[xyz]max.
2012-06-19 10:08:04 +00:00
Laurent Rineau ab28ccf740 Fix bugs in overflow/underflow handling 2012-06-18 16:05:29 +00:00
Laurent Rineau 5142588eb3 Better performance (~10-15% better)
By removing several tests (and use CGAL::max instead), the generated
assembly is more efficient.
2012-06-18 16:05:04 +00:00
Laurent Rineau f4b3f4361f Remove a warning about deprecated header
We test the deprecated headers on purpose, so one can define
CGAL_NO_DEPRECATION_WARNINGS.
2012-06-18 13:21:10 +00:00
Laurent Rineau ad2b26dbed Fix a warning about unused variables
And fix a comment (t=1 instead of t=0).
2012-06-18 13:04:53 +00:00
Laurent Rineau a9bcc0cee2 Fix a documentation warning that was an actual documentation bug
For copy-paste reason, the documentation of Min_sphere_of_points_d_traits_2
was beginning by \begin{ccRefClass}{Min_sphere_of_spheres_d_traits_2}.
2012-06-18 12:22:44 +00:00
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
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
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