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

Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'

This commit is contained in:
Sébastien Loriot 2020-05-12 16:58:32 +02:00
parent 6c94c1501e 1008eaed39
commit fb83386f44
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
View File

@ -458,7 +458,7 @@ public:
void set_neighbor(int i, Cell_handle n)
{
CGAL_triangulation_precondition( i >= 0 && i <= 3);
CGAL_triangulation_precondition( this != &*n );
CGAL_triangulation_precondition( this != n.operator->() );
N[i] = n;
}
@ -471,10 +471,10 @@ public:
void set_neighbors(Cell_handle n0, Cell_handle n1,
Cell_handle n2, Cell_handle n3)
{
CGAL_triangulation_precondition( this != &*n0 );
CGAL_triangulation_precondition( this != &*n1 );
CGAL_triangulation_precondition( this != &*n2 );
CGAL_triangulation_precondition( this != &*n3 );
CGAL_triangulation_precondition( this != n0.operator->() );
CGAL_triangulation_precondition( this != n1.operator->() );
CGAL_triangulation_precondition( this != n2.operator->() );
CGAL_triangulation_precondition( this != n3.operator->() );
N[0] = n0;
N[1] = n1;
N[2] = n2;

6
Polygon_mesh_processing/examples/Polygon_mesh_processing/repair_polygon_soup_example.cpp
View File

@ -11,7 +11,7 @@
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef K::Point_3 Point_3;
typedef std::vector<std::size_t> Polygon;
typedef std::vector<std::size_t> CGAL_Polygon;
typedef CGAL::Surface_mesh<Point_3> Mesh;
namespace PMP = CGAL::Polygon_mesh_processing;
@ -20,7 +20,7 @@ int main(int, char**)
{
// First, construct a polygon soup with some problems
std::vector<Point_3> points;
std::vector<Polygon> polygons;
std::vector<CGAL_Polygon> polygons;
points.push_back(Point_3(0,0,0));
points.push_back(Point_3(1,0,0));
@ -30,7 +30,7 @@ int main(int, char**)
points.push_back(Point_3(0,1,0)); // duplicate point
points.push_back(Point_3(0,-2,0)); // unused point
Polygon p;
CGAL_Polygon p;
p.push_back(0); p.push_back(1); p.push_back(2);
polygons.push_back(p);

2
Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp
View File

@ -527,7 +527,7 @@ void Cluster_classification::change_color (int index, float* vmin, float* vmax)
int cid = m_cluster_id[*it];
if (cid != -1)
{
float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][cid]));
float v = (std::max) (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][cid]));
m_points->point_set()->set_color(*it, ramp.r(v) * 255, ramp.g(v) * 255, ramp.b(v) * 255);
}
else

2
Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp
View File

@ -151,7 +151,7 @@ void Surface_mesh_item_classification::change_color (int index, float* vmin, flo
{
for(face_descriptor fd : faces(*(m_mesh->polyhedron())))
{
float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][fd]));
float v = (std::max) (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][fd]));
m_color[fd] = CGAL::Color((unsigned char)(ramp.r(v) * 255),
(unsigned char)(ramp.g(v) * 255),
(unsigned char)(ramp.b(v) * 255));

8
Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp
View File

@ -143,11 +143,11 @@ public:
{
bbox = bbox + ps.point(*it).bbox();
}
CGAL::qglviewer::Vec min(bbox.xmin(),bbox.ymin(),bbox.zmin());
CGAL::qglviewer::Vec max(bbox.xmax(),bbox.ymax(),bbox.zmax());
CGAL::qglviewer::Vec v_min(bbox.xmin(),bbox.ymin(),bbox.zmin());
CGAL::qglviewer::Vec v_max(bbox.xmax(),bbox.ymax(),bbox.zmax());
setBbox(Bbox(min.x,min.y,min.z,
max.x,max.y,max.z));
setBbox(Bbox(v_min.x,v_min.y,v_min.z,
v_max.x,v_max.y,v_max.z));
}
bool isEmpty() const{return false;}
Q_SIGNALS:

8
TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h
View File

@ -160,10 +160,10 @@ public:
void set_neighbors(Cell_handle n0, Cell_handle n1,
Cell_handle n2, Cell_handle n3)
{
CGAL_triangulation_precondition( this != &*n0 );
CGAL_triangulation_precondition( this != &*n1 );
CGAL_triangulation_precondition( this != &*n2 );
CGAL_triangulation_precondition( this != &*n3 );
CGAL_triangulation_precondition( this != n0.operator->() );
CGAL_triangulation_precondition( this != n1.operator->() );
CGAL_triangulation_precondition( this != n2.operator->() );
CGAL_triangulation_precondition( this != n3.operator->() );
N[0] = n0;
N[1] = n1;
N[2] = n2;