From 06e1e9b596fd7aead155b33fe972550033025d93 Mon Sep 17 00:00:00 2001
From: "b.schroeder" <b.schroeder@fz-juelich.de>
Date: Thu, 4 Dec 2014 09:40:54 +0100
Subject: [PATCH] bugfixes for isnan issues during MacOSX complitation
---
src/IO/TraVisToClient.cpp | 2 +-
src/MainWindow.cpp | 4 ++--
src/ThreadDataTransfert.cpp | 11 ++++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
mode change 100644 => 100755 src/IO/TraVisToClient.cpp
mode change 100644 => 100755 src/MainWindow.cpp
mode change 100644 => 100755 src/ThreadDataTransfert.cpp
diff --git a/src/IO/TraVisToClient.cpp b/src/IO/TraVisToClient.cpp
old mode 100644
new mode 100755
index 70614c3..ffa8ffb
--- a/src/IO/TraVisToClient.cpp
+++ b/src/IO/TraVisToClient.cpp
@@ -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);
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
old mode 100644
new mode 100755
index faba01b..a2b0238
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -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));
}
diff --git a/src/ThreadDataTransfert.cpp b/src/ThreadDataTransfert.cpp
old mode 100644
new mode 100755
index 36fabf0..b40dfb4
--- a/src/ThreadDataTransfert.cpp
+++ b/src/ThreadDataTransfert.cpp
@@ -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;
}
}
--
GitLab