From d0b379a2d5ea7e18b55be5e66e2f22d8f4da88ee Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 29 Sep 2017 16:43:23 +0200 Subject: [PATCH] double* changed to char* in gui data call back, effect in receiver is change in zmqsocket.h from int* to char* --- slsReceiverSoftware/include/ZmqSocket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h index fc6c80bf2..9bb95bdc7 100644 --- a/slsReceiverSoftware/include/ZmqSocket.h +++ b/slsReceiverSoftware/include/ZmqSocket.h @@ -387,7 +387,7 @@ public: * @param size size of image * @returns length of data received */ - int ReceiveData(const int index, int* buf, const int size) + int ReceiveData(const int index, char* buf, const int size) { zmq_msg_t message; zmq_msg_init (&message); @@ -398,13 +398,13 @@ public: #ifdef VERBOSE cprintf(BLUE,"%d actual data\n", index); #endif - memcpy((char*)buf, (char*)zmq_msg_data(&message), size); + memcpy(buf, (char*)zmq_msg_data(&message), size); } //incorrect size else { cprintf(RED,"Error: Received weird packet size %d for socket %d\n", length, index); - memset((char*)buf,0xFF,size); + memset(buf,0xFF,size); } zmq_msg_close(&message);