Commit Graph

73 Commits

Author SHA1 Message Date
Laurent Rineau be079cb5a3 Fix compilation with Boost-1.56 and later
In Boost-1.56 and later, with C++11, boost::optional::operator bool() is
explicit.
2015-01-13 16:21:04 +01:00
Sébastien Loriot 8a24539242 trivial bugfix preventing segfault in case of filter failure
The construction of the line l can fail while the size of the list
has been increased. This would lead to trying to remove an element
never added. The fix simply delay the size increment after the line
construction.

the construction of the line can fail and the new point no
2013-09-27 17:42:26 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Sébastien Loriot ed8bace765 fix a memory leak in case of filter failure for example
the size of the hand-made linked list was not updated correctly
2013-06-28 17:28:30 +02:00
Sébastien Loriot 496d75c256 update licenses that were incorrect after merging replace object feature branch 2013-06-21 15:06:17 +02:00
Laurent Rineau e80d83500b Fix new warnings in the Object-boost::variant code 2013-06-18 10:54:38 +02:00
Sébastien Loriot 4b603f40ba fix the compilation loop bug with result_of implemented with decltypes
I introduce a dedicated intersection traits and all CK2 member functions
use this traits instead of the general one. That way, the return type
is always correct. The same fix will be done for CK3
2013-03-15 13:21:05 +01:00
Sébastien Loriot f97d6b8bd9 s/boost::result_of/cpp11::result_of/g 2013-03-14 10:38:13 +01:00
Philipp Möller 03151d7bb7 intersection_return now also uses result_of 2012-12-10 17:20:36 +01:00
Philipp Möller a214d62bd6 Integrate boost::variant with Lazy kernels interaction
This requires changing the way Lazy_construction_XXX wrappers are
selected and some code to unpack variants.
2012-12-06 17:27:23 +01:00
Philipp Möller 215ef53720 Intersection_2 fixup 2012-12-05 12:13:10 +01:00
Philipp Möller 96bf28bb01 Triangle_2_Iso_rectangle_2 fixup 2012-12-04 18:37:58 +01:00
Philipp Möller d198458ca7 Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
Conflicts:
	.gitattributes
	AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
	AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
	AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
	AABB_tree/include/CGAL/AABB_traits.h
	AABB_tree/include/CGAL/AABB_tree.h
	AABB_tree/test/AABB_tree/AABB_test_util.h
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
	Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
	Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
	Filtered_kernel/include/CGAL/Lazy.h
	Filtered_kernel/include/CGAL/Lazy_kernel.h
	Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
	Intersections_2/test/Intersections_2/test_intersections_2.cpp
	Intersections_3/test/Intersections_3/test_intersections_3.cpp
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_23/include/CGAL/Kernel/Type_mapper.h
	Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
Sébastien Loriot c4b1beb81f *active intersection(Triangle_2,Iso_rectangle_2) already implemented
(with a bug-fix in the implementation)
*add do_intersect_2(Triangle_2,Iso_rectangle_2)
*add test
2012-10-15 09:56:22 +00:00
Laurent Rineau 2cec4e33c3 WARNFIX
Fix the unused parameter Q2 of function intersection_test_edge() in
<CGAL/Triangle_2_Triangle_2_do_intersect.h>.

Fix also a set-by-unused variable in
<CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h>.
2012-08-06 15:32:55 +00:00
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Philipp Möller 17797b7271 Merge next into this branch. There have been conflicts in the
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.

The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
Philipp Möller ee09ef2297 Overloading intersection and do_intersect now work by introducing a better match for every possible function 2011-11-18 14:14:41 +00:00
Philipp Möller 450f438518 IT shortcut not circumvents specifying a kernel making it an actual shortcut and nicer for exposure in APIs 2011-11-10 11:06:26 +00:00
Philipp Möller a4e6d57cff Circular_kernel_2 and Circular_kernel_3 now use CGAL_INTERSECTION_VERSION for backwards compatability 2011-11-09 14:29:46 +00:00
Philipp Möller c2bfb68112 * Now dispatching on Ambient_dimension
* incorporated result_type == Object to remove more ifdefs
2011-11-09 11:35:04 +00:00
Philipp Möller 33430eef68 Intersections_3 now fully uses CGAL_INTERSECTION_VERSION 2011-11-08 17:37:24 +00:00
Philipp Möller 66d08b8d65 Intersections_2 now uses CGAL_INTERSECTION_VERSION for backwards compatibility 2011-11-08 13:55:12 +00:00
Philipp Möller a6f4cb16ae Macro for versioning the intersections and support for both versions in the top level function. 2011-11-08 11:56:57 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Philipp Möller b07e2df018 * Circular_kernel is now Object free, doesn't compile with Lazy yet,
* hack for ternary function
2011-08-25 21:40:12 +00:00
Philipp Möller a1576670e3 Weird remove with subversion 2011-08-25 14:07:29 +00:00
Philipp Möller 5b925d6f6e * Reworked Intersection_traits into a single traits, adjusted
intersections accordingly, turned on IT<....> as return type
* removed result_type from the intersection functors
2011-08-25 10:18:31 +00:00
Philipp Möller 203e5e6f02 Template typo 2011-07-22 00:50:25 +00:00
Philipp Möller fad504838f * Circular_kernel: - Intersections now use variants
- removed most internal uses of Object
* Intersections: more traits, typofix, doc typofix, aliases IT23d
2011-07-20 22:54:03 +00:00
Philipp Möller 12f79a7d1e Object includes and last intersection stragglers 2011-07-18 17:31:20 +00:00
Philipp Möller 2f9b36d618 * intersection and do_intersection now pick their appropriate
overloads automatically;

* a test for the availability of all calls has been added
2011-07-12 16:53:49 +00:00
Philipp Möller 0cbd02a7e5 global free function do_intersect and intersections now use traits instead of overloading 2011-07-06 12:38:58 +00:00
Philipp Möller 6afb8bfea2 * Distance_2: removed unnecessary Object include
* Intersections_2:      Intersections_traits_2 added
                        All Intersections now use Intersection_traits and variants internally 
                        but the public interface still converts to CGAL::Object
2011-07-06 00:58:51 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Laurent Rineau 08418743b9 Typo. 2009-10-20 10:18:30 +00:00
Laurent Rineau eec1738f8f Factorize do_intersect(line, seg, k) and do_intersect(seg, line, k). 2009-10-20 09:57:22 +00:00
Laurent Rineau 83912b2952 Massive fix of svn:keywords properties, and $URL$ keyword. 2009-10-20 08:59:26 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Pedro Machado Manhaes de Castro 810601ebb1 Circle_2 Line_2 do_intersect can be done with rationals 2008-10-13 20:35:32 +00:00
Sylvain Pion 696cbd9e6e More *_pair classes cleanups. 2008-09-07 15:09:56 +00:00
Sylvain Pion 8db83a466a Refactorize Segment_2_Iso_rectangle_2_pair to avoid warning. 2008-08-30 11:10:46 +00:00
Sylvain Pion 00d87d50fc Remove "unused argument" warnings. 2008-08-30 10:29:04 +00:00
Sylvain Pion 7d2a42123d Line_2_Line_2_pair changes to avoid a warning.
(code dating back to the origins of CGAL... and it shows...)
2008-08-21 12:50:41 +00:00
Sylvain Pion f5b031be68 Common reformatting of the _pair classes (oh joy...). 2008-08-20 13:49:31 +00:00
Sylvain Pion 49549ded08 Remove the "may be used uninitialized in this function" by refactoring/cleaning the code
(much more would need to be done in this area...).
2008-08-20 12:36:50 +00:00
Sylvain Pion 173ef7c590 Allow propagation of Uncertain-ty in more places, to reduce the number of exceptions.
- Use K::Bool_type, K::Orientation... instead of bool, CGAL::Orientation...
- More functions around Uncertain<> : make_certain(), extract_singleton(),
                                      possible conversions tightenning.

Many conversions still remain, e.g. for switch and if statements, &&, ||...
2008-07-16 13:45:13 +00:00