songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed minor mistakes from a rebase

This commit is contained in:
Mael Rouxel-Labbé 2017-05-19 14:24:11 +02:00
parent 5199041815
commit 5f1ba08d52
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
View File

@ -32,6 +32,7 @@ template< class K_ >
class Weighted_alpha_shape_euclidean_traits_2
: public K_
{
public:
Weighted_alpha_shape_euclidean_traits_2() { }
Weighted_alpha_shape_euclidean_traits_2(const K_& k) : K_(k) { }
};

1
Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
View File

@ -31,6 +31,7 @@ template < class K_ >
class Weighted_alpha_shape_euclidean_traits_3
: public K_
{
public:
Weighted_alpha_shape_euclidean_traits_3() { }
Weighted_alpha_shape_euclidean_traits_3(const K_& k) : K_(k) { }
};

2
Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h
View File

@ -51,7 +51,7 @@ public:
\warning The `explicit` keyword is used to avoid accidental implicit conversions
between Point_2 and Weighted_point_2.
*/
Weighted_point_2(const Point_2<Kernel>& p);
explicit Weighted_point_2(const Point_2<Kernel>& p);
/*!
introduces a weighted point from point `p` and weight `w`.

7
Kernel_23/include/CGAL/Kernel/function_objects.h
View File

@ -432,11 +432,12 @@ namespace CommonKernelFunctors {
K traits;
typename K::Orientation_3 orientation = traits.orientation_3_object();
typename K::Construct_point_3 wp2p = traits.construct_point_3_object();
typename K::Power_side_of_oriented_power_sphere_3 power_test = traits.power_side_of_oriented_power_sphere_3_object();
typename K::Power_side_of_oriented_power_sphere_3 power_test =
traits.power_side_of_oriented_power_sphere_3_object();
typename K::Orientation o = orientation(wp2p(p),wp2p(q),wp2p(r),wp2p(s));
typename K::Oriented_side os = power_test(p,q,r,s,t);
// power_test_3
// returns in fact minus the 5x5 determinant of lifted (p,q,r,s.t)
// Power_side_of_oriented_power_sphere_3
// returns in fact minus the 5x5 determinant of lifted (p,q,r,s,t)
CGAL_assertion(o != COPLANAR);
return enum_cast<Bounded_side>(o * os);
}

16
Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
View File

@ -636,9 +636,9 @@ Scene_c3t3_item::graphicalToolTip() const
std::vector<int>
create_histogram(const C3t3& c3t3, double& min_value, double& max_value)
{
typename Geom_traits::Compute_approximate_dihedral_angle_3 approx_dihedral_angle
Geom_traits::Compute_approximate_dihedral_angle_3 approx_dihedral_angle
= c3t3.triangulation().geom_traits().compute_approximate_dihedral_angle_3_object();
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= c3t3.triangulation().geom_traits().construct_point_3_object();
std::vector<int> histo(181, 0);
@ -646,7 +646,7 @@ create_histogram(const C3t3& c3t3, double& min_value, double& max_value)
min_value = 180.;
max_value = 0.;
for (typename C3t3::Cells_in_complex_iterator cit = c3t3.cells_in_complex_begin();
for (C3t3::Cells_in_complex_iterator cit = c3t3.cells_in_complex_begin();
cit != c3t3.cells_in_complex_end();
++cit)
{
@ -1178,7 +1178,7 @@ void Scene_c3t3_item::export_facets_in_complex()
std::vector<std::vector<std::size_t> > polygons(c3t3().number_of_facets_in_complex());
std::size_t index = 0;
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= c3t3().triangulation().geom_traits().construct_point_3_object();
BOOST_FOREACH(C3t3::Vertex_handle v, vertex_set)
@ -1402,7 +1402,7 @@ void Scene_c3t3_item_priv::initializeBuffers(CGAL::Three::Viewer_interface *view
void Scene_c3t3_item_priv::computeIntersection(const Primitive& facet)
{
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= c3t3.triangulation().geom_traits().construct_point_3_object();
Tr::Cell_handle ch = facet.id().first;
@ -1477,7 +1477,7 @@ void Scene_c3t3_item_priv::computeIntersections()
void Scene_c3t3_item_priv::computeSpheres()
{
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= c3t3.triangulation().geom_traits().construct_point_3_object();
if(!spheres)
@ -1558,7 +1558,7 @@ void Scene_c3t3_item_priv::computeElements()
//The facets
{
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= c3t3.triangulation().geom_traits().construct_point_3_object();
for (C3t3::Facet_iterator
@ -1799,7 +1799,7 @@ bool Scene_c3t3_item::keyPressEvent(QKeyEvent *event)
QString Scene_c3t3_item::computeStats(int type)
{
typename Geom_traits::Construct_point_3 wp2p
Geom_traits::Construct_point_3 wp2p
= d->c3t3.triangulation().geom_traits().construct_point_3_object();
if(!d->computed_stats)

4
Triangulation_2/include/CGAL/Regular_triangulation_2.h
View File

@ -50,8 +50,8 @@ template < class Gt,
class Regular_triangulation_2
: public Triangulation_2<Gt, Tds>
{
typedef Regular_triangulation_2<Gt, Tds> Self;
typedef Triangulation_2<Gt, Tds> Base;
typedef Regular_triangulation_2<Gt, Tds> Self;
typedef Triangulation_2<Gt, Tds> Base;
public:
typedef Self Triangulation;