From 753f402d0b35af1e77e51e499fd99c8c14f53c4a Mon Sep 17 00:00:00 2001 From: acoromin <acoromin@224674b8-e365-4e73-a4a8-558dbbfec58c> Date: Mon, 14 Dec 2015 10:57:56 +0000 Subject: [PATCH] Added std:: to isnan and isinf calls --- src/clustering.cpp | 4 ++-- src/object_detector.cpp | 2 +- src/scan_basics.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/clustering.cpp b/src/clustering.cpp index b5a4a7c..950d549 100644 --- a/src/clustering.cpp +++ b/src/clustering.cpp @@ -271,7 +271,7 @@ void laserscanutils::preFilterScan(const laserscanutils::ScanParams & _params, { act_range = _ranges[i]; - if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(isnan(act_range)) && !(isinf(act_range)) ) + if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(std::isnan(act_range)) && !(std::isinf(act_range)) ) { act_theta = _params.angle_min_+ _params.angle_step_*(i); @@ -701,7 +701,7 @@ unsigned int laserscanutils::scanProcess(const ScanParams & _params, for(unsigned int i=0; i<_ranges.size(); ++i) { act_range = _ranges[i]; - if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(isnan(act_range)) && !(isinf(act_range)) ) + if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(std::isnan(act_range)) && !(std::isinf(act_range)) ) { act_theta = _params.angle_min_+ _params.angle_step_*(i); diff --git a/src/object_detector.cpp b/src/object_detector.cpp index 35607fc..5a6c08f 100644 --- a/src/object_detector.cpp +++ b/src/object_detector.cpp @@ -254,7 +254,7 @@ void laserscanutils::preFilterScan2homog(const laserscanutils::ScanParams & _par { act_range = _ranges[i]; - if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(isnan(act_range)) && !(isinf(act_range)) ) + if ( (act_range >=_params.range_min_) && (act_range <= _params.range_max_) && !(std::isnan(act_range)) && !(std::isinf(act_range)) ) { act_theta = _params.angle_min_+ _params.angle_step_*(i); diff --git a/src/scan_basics.cpp b/src/scan_basics.cpp index aed6946..193f2bc 100644 --- a/src/scan_basics.cpp +++ b/src/scan_basics.cpp @@ -26,7 +26,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> & //for each range, check correctness of value and translate from polar to xy coordinates while (ii <_ranges.size()) { - if ( _ranges[ii] >_params.range_min_ && _ranges[ii] < _params.range_max_ && !isnan(_ranges[ii]) && !isinf(_ranges[ii]) ) + if ( _ranges[ii] >_params.range_min_ && _ranges[ii] < _params.range_max_ && !std::isnan(_ranges[ii]) && !std::isinf(_ranges[ii]) ) { //transform from polar to euclidean _points(0,ii) = _ranges[ii] * cos(azimuth); @@ -66,7 +66,7 @@ void laserscanutils::ranges2xy(const ScanParams & _params, std::vector<float> & //for each range, check correctness of value and translate from polar to xy coordinates while (ii <_ranges.size()) { - if ( _ranges[ii] >_params.range_min_ && _ranges[ii] < _params.range_max_ && !isnan(_ranges[ii]) && !isinf(_ranges[ii]) ) + if ( _ranges[ii] >_params.range_min_ && _ranges[ii] < _params.range_max_ && !std::isnan(_ranges[ii]) && !std::isinf(_ranges[ii]) ) { //transform from polar to euclidean _points(0,ii) = _ranges[ii] * cos(azimuth); -- GitLab