From dbd47ab70b9b5747bb83772195f4c5ab9f6c442f Mon Sep 17 00:00:00 2001 From: gianpaolopalma Date: Fri, 23 Feb 2018 16:09:19 +0100 Subject: [PATCH] Fixing compilation error --- vcg/complex/algorithms/point_outlier.h | 3 +-- vcg/space/index/kdtree/kdtree_face.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/vcg/complex/algorithms/point_outlier.h b/vcg/complex/algorithms/point_outlier.h index 24ef6a61..5f460d11 100644 --- a/vcg/complex/algorithms/point_outlier.h +++ b/vcg/complex/algorithms/point_outlier.h @@ -25,7 +25,6 @@ #include - namespace vcg { @@ -94,7 +93,7 @@ class OutlierRemoval dem += 0.230389 * value * value; dem += 0.000972 * value * value * value; dem += 0.078108 * value * value * value * value; - ScalarType op = max(0.0, 1.0 - 1.0 / dem); + ScalarType op = std::max(0.0, 1.0 - 1.0 / dem); outlierScore[i] = op; } diff --git a/vcg/space/index/kdtree/kdtree_face.h b/vcg/space/index/kdtree/kdtree_face.h index 66d11a10..3936789e 100644 --- a/vcg/space/index/kdtree/kdtree_face.h +++ b/vcg/space/index/kdtree/kdtree_face.h @@ -73,7 +73,7 @@ namespace vcg { { targetCellSize = maxObjPerCell; targetMaxDepth = maxDepth; - Set(mesh, maxObjPerCell, maxDepth); + Set(mesh.face.begin(), mesh.face.end(), mesh.face.size(), onlySelection); }; ~KdTreeFace()