mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 01:20:25 +08:00
changed all std::atof() to uStr2Float() to fix locale comma float conversion problem
This commit is contained in:
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include "rtabmap/utilite/ULogger.h"
|
||||
#include "rtabmap/utilite/UFile.h"
|
||||
#include "rtabmap/utilite/UDirectory.h"
|
||||
#include "rtabmap/utilite/UConversion.h"
|
||||
#include <opencv2/highgui/highgui.hpp>
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -61,7 +62,7 @@ int main(int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
rate = std::atof(argv[i]);
|
||||
rate = uStr2Float(argv[i]);
|
||||
if(rate < 0)
|
||||
{
|
||||
showUsage();
|
||||
|
||||
@@ -144,7 +144,7 @@ int main(int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
rate = std::atof(argv[i]);
|
||||
rate = uStr2Float(argv[i]);
|
||||
if(rate < 0)
|
||||
{
|
||||
showUsage();
|
||||
@@ -161,7 +161,7 @@ int main(int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
rate = std::atof(argv[i]);
|
||||
rate = uStr2Float(argv[i]);
|
||||
if(rate < 0)
|
||||
{
|
||||
showUsage();
|
||||
|
||||
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <rtabmap/utilite/ULogger.h>
|
||||
#include <rtabmap/utilite/UFile.h>
|
||||
#include <rtabmap/utilite/UConversion.h>
|
||||
#include <rtabmap/core/CameraThread.h>
|
||||
#include <rtabmap/core/CameraRGBD.h>
|
||||
#include <rtabmap/core/Camera.h>
|
||||
@@ -91,7 +92,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
rate = std::atof(argv[i]);
|
||||
rate = uStr2Float(argv[i]);
|
||||
if(rate < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
|
||||
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
planeDistanceThreshold = std::atof(argv[i]);
|
||||
planeDistanceThreshold = uStr2Float(argv[i]);
|
||||
if(planeDistanceThreshold < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
planeEpsAngle = std::atof(argv[i]);
|
||||
planeEpsAngle = uStr2Float(argv[i]);
|
||||
if(planeEpsAngle < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
clusterTolerance = std::atof(argv[i]);
|
||||
clusterTolerance = uStr2Float(argv[i]);
|
||||
if(clusterTolerance <= 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
|
||||
@@ -175,7 +175,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
nndr = std::atof(argv[i]);
|
||||
nndr = uStr2Float(argv[i]);
|
||||
if(nndr < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
@@ -192,7 +192,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
rate = std::atof(argv[i]);
|
||||
rate = uStr2Float(argv[i]);
|
||||
if(rate < 0)
|
||||
{
|
||||
showUsage();
|
||||
@@ -244,7 +244,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
sec = std::atof(argv[i]);
|
||||
sec = uStr2Float(argv[i]);
|
||||
if(sec < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
@@ -261,7 +261,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
distance = std::atof(argv[i]);
|
||||
distance = uStr2Float(argv[i]);
|
||||
if(distance <= 0)
|
||||
{
|
||||
showUsage();
|
||||
@@ -312,7 +312,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
maxDepth = std::atof(argv[i]);
|
||||
maxDepth = uStr2Float(argv[i]);
|
||||
if(maxDepth < 0)
|
||||
{
|
||||
showUsage();
|
||||
@@ -380,7 +380,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
voxel = std::atof(argv[i]);
|
||||
voxel = uStr2Float(argv[i]);
|
||||
if(voxel < 0)
|
||||
{
|
||||
showUsage();
|
||||
@@ -414,7 +414,7 @@ int main (int argc, char * argv[])
|
||||
++i;
|
||||
if(i < argc)
|
||||
{
|
||||
ratio = std::atof(argv[i]);
|
||||
ratio = uStr2Float(argv[i]);
|
||||
if(ratio < 0.0f)
|
||||
{
|
||||
showUsage();
|
||||
|
||||
@@ -117,7 +117,7 @@ int main(int argc, char * argv[])
|
||||
//get descriptor
|
||||
for(;i<dimension && iter != strList.end(); ++i, ++iter)
|
||||
{
|
||||
descriptor[i] = std::atof(iter->c_str());
|
||||
descriptor[i] = uStr2Float(*iter);
|
||||
}
|
||||
if(i != dimension)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user