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-5.0-branch'

This commit is contained in:
Sébastien Loriot 2020-04-27 09:49:48 +02:00
parent 0325219ce6 0c50c0c541
commit 5cb853af74
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp
View File

@ -58,7 +58,7 @@ bool read_off_ascii(Surface_mesh& mesh,
// #Vertice, #Faces, #Edges // #Vertice, #Faces, #Edges
items = fscanf(in, "%d %d %d\n", (int*)&nV, (int*)&nF, (int*)&nE); items = fscanf(in, "%d %d %d\n", (int*)&nV, (int*)&nF, (int*)&nE);
mesh.clear(); mesh.clear();
mesh.reserve(nV, std::max(3*nV, nE), nF); mesh.reserve(nV, (std::max)(3*nV, nE), nF);
// read vertices: pos [normal] [color] [texcoord] // read vertices: pos [normal] [color] [texcoord]
@ -173,7 +173,7 @@ bool read_off_binary(Surface_mesh& mesh,
read(in, nF); read(in, nF);
read(in, nE); read(in, nE);
mesh.clear(); mesh.clear();
mesh.reserve(nV, std::max(3*nV, nE), nF); mesh.reserve(nV, (std::max)(3*nV, nE), nF);
// read vertices: pos [normal] [color] [texcoord] // read vertices: pos [normal] [color] [texcoord]

4
Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h
View File

@ -210,7 +210,7 @@ public:
Vector<Scalar,N>& normalize() Vector<Scalar,N>& normalize()
{ {
Scalar n = norm(*this); Scalar n = norm(*this);
if (n > std::numeric_limits<Scalar>::min()) if (n > (std::numeric_limits<Scalar>::min)())
*this *= 1.0/n; *this *= 1.0/n;
return *this; return *this;
} }
@ -500,7 +500,7 @@ public:
Vector<Scalar,3>& normalize() Vector<Scalar,3>& normalize()
{ {
Scalar n = norm(*this); Scalar n = norm(*this);
n = (n > std::numeric_limits<Scalar>::min()) ? 1.0/n : 0.0; n = (n > (std::numeric_limits<Scalar>::min)()) ? 1.0/n : 0.0;
x *= n; x *= n;
y *= n; y *= n;
z *= n; z *= n;

2
Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h
View File

@ -63,7 +63,7 @@ private:
Dart getShortestEdge() Dart getShortestEdge()
{ {
double weight = std::numeric_limits<double>::max(); double weight = (std::numeric_limits<double>::max)();
Dart dart = NIL; Dart dart = NIL;
bool boundary=false; bool boundary=false;

2
Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h
View File

@ -319,7 +319,7 @@ private:
Dart_handle getShortestEdge() Dart_handle getShortestEdge()
{ {
double weight = std::numeric_limits<double>::max(); double weight = (std::numeric_limits<double>::max)();
Dart_handle dart = lcc.null_dart_handle; Dart_handle dart = lcc.null_dart_handle;
int m=lcc.get_new_mark(); int m=lcc.get_new_mark();

2
Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h
View File

@ -129,7 +129,7 @@ private:
// Find the mesh's shortest edge // Find the mesh's shortest edge
EdgeHandle getShortestEdge() EdgeHandle getShortestEdge()
{ {
double max_weight = std::numeric_limits<double>::max(); double max_weight = (std::numeric_limits<double>::max)();
EdgeHandle eh = Mesh::InvalidEdgeHandle; EdgeHandle eh = Mesh::InvalidEdgeHandle;
bool boundary=false; bool boundary=false;