From 34508012a8d3ed1f42f98a5de6aa4a8c71be5b46 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Dec 2015 16:39:01 +0100 Subject: [PATCH] prevnumber is unsigned before bug --- slsReceiverSoftware/include/UDPStandardImplementation.h | 2 +- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/include/UDPStandardImplementation.h b/slsReceiverSoftware/include/UDPStandardImplementation.h index 0921ad934..e25594f8f 100644 --- a/slsReceiverSoftware/include/UDPStandardImplementation.h +++ b/slsReceiverSoftware/include/UDPStandardImplementation.h @@ -521,7 +521,7 @@ private: uint64_t currentFrameNumber; /** Previous Frame number from buffer to calculate loss */ - uint64_t previousFrameNumber; + int64_t previousFrameNumber; /* Acquisition started */ bool acqStarted; diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 3cb511b87..87d920440 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -1938,7 +1938,7 @@ int slsReceiverTCPIPInterface::jungfrau_read_frame(){ currentPacket--; continue; } - if(ipnum!= currentPacket){ + if((int64_t)ipnum!= currentPacket){ cout << "current packet " << currentPacket << " Wrong packet number " << ipnum << ", copying blank packet" << endl; memcpy(retval+offsetdest,blackpacket,oneDataSize); offsetdest += oneDataSize;