From 4340f127e12d01ae9356e36e73383892d53b5298 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 17 Apr 2013 17:41:37 -0700 Subject: [PATCH] cast max uint16_t to float for angle unpack --- libraries/avatars/src/AvatarData.cpp | 2 +- libraries/shared/src/AgentList.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 60e05b8d05..955ed0cc9f 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -25,7 +25,7 @@ int packFloatAngleToTwoByte(unsigned char* buffer, float angle) { } int unpackFloatAngleFromTwoByte(uint16_t* byteAnglePointer, float* destinationPointer) { - *destinationPointer = (*byteAnglePointer / std::numeric_limits::max()) * 360.0 - 180; + *destinationPointer = (*byteAnglePointer / (float) std::numeric_limits::max()) * 360.0 - 180; return sizeof(uint16_t); } diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index e4325df2a0..25a98cdb31 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -107,7 +107,7 @@ void AgentList::processBulkAgentData(sockaddr *senderAddress, unsigned char *pac bulkSendAgent->setLastRecvTimeUsecs(usecTimestampNow()); } - unsigned char *startPosition = (unsigned char *)packetData; + unsigned char *startPosition = packetData; unsigned char *currentPosition = startPosition + 1; unsigned char packetHolder[numBytesPerAgent + 1];