Skip to content
Snippets Groups Projects
Commit 06e1e9b5 authored by b.schroeder's avatar b.schroeder
Browse files

bugfixes for isnan issues during MacOSX complitation

parent c2e81e3c
Branches
Tags
No related merge requests found
......@@ -273,7 +273,7 @@ TraVisToClient::createServerSocket(unsigned short portNumber)
srvAddr.sin_addr.s_addr = htonl(INADDR_ANY);
/* try to bind socket to the specified server port */
if (SOCKET_ERROR == bind(sock, (struct sockaddr *) & srvAddr, sizeof (srvAddr))) {
if (SOCKET_ERROR == ::bind(sock, (struct sockaddr *) & srvAddr, sizeof (srvAddr))) {
derror("bind() failed!");
//FIXME:
//closesocket(tcpSocket);
......
......@@ -538,11 +538,11 @@ bool MainWindow::parsePedestrianShapes(QDomNode shapeNode, int groupID)
if(!ok)color=std::numeric_limits<int>::quiet_NaN();
Debug::Messages("id= %d height= %lf color =%d",id,height,color);
if(!std::isnan(height)) {
if(height!=height) {
heights.append(QString::number(id));
heights.append(QString::number(height));
}
if(!std::isnan(color)) {
if(color!=color) {
colors.append(QString::number(id));
colors.append(QString::number(color));
}
......
......@@ -59,7 +59,7 @@
#include "Debug.h"
using namespace std;
//using namespace std;
ThreadDataTransfer::ThreadDataTransfer(QObject *parent):
......@@ -406,11 +406,12 @@ void ThreadDataTransfer::parseShapeNode(QDomNode shape)
if(!ok)color=std::numeric_limits<int>::quiet_NaN();
//cout <<"id= " <<id <<" height= "<<height<<" color= "<<color<<endl;
if(!std::isnan(height)) {
//if(!std::isnan(height)) {
if(height!=height) {
heights.append(QString::number(id));
heights.append(QString::number(height));
}
if(!std::isnan(color)) {
if(color!=color) {
colors.append(QString::number(id));
colors.append(QString::number(color));
}
......@@ -441,7 +442,7 @@ void ThreadDataTransfer::InitHeader(int major, int minor, int patch)
_jps_ellipseOrientation=QString("eO");
_jps_ellipseColor=QString("eC");
} else {
cout<<"unsupported header version: "<<major<<"."<<minor<<"."<<patch<<endl;
cout<<"Please use 0.5 0.5.1 or 0.6 "<<endl;
std::cout<<"unsupported header version: "<<major<<"."<<minor<<"."<<patch<<std::endl;
std::cout<<"Please use 0.5 0.5.1 or 0.6 "<<std::endl;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment