From 4a777f600f75cf972a978084583927250203f9fd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 6 Jul 2015 15:11:36 -0700 Subject: [PATCH] Change DDE Packet struct name to avoid collision --- interface/src/devices/DdeFaceTracker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp index 6facf44b91..71039475a4 100644 --- a/interface/src/devices/DdeFaceTracker.cpp +++ b/interface/src/devices/DdeFaceTracker.cpp @@ -118,7 +118,7 @@ static const float DDE_COEFFICIENT_SCALES[] = { 1.0f // CheekSquint_R }; -struct Packet { +struct DDEPacket { //roughly in mm float focal_length[1]; float translation[3]; @@ -347,7 +347,7 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) { bool isFiltering = Menu::getInstance()->isOptionChecked(MenuOption::VelocityFilter); - Packet packet; + DDEPacket packet; int bytesToCopy = glm::min((int)sizeof(packet), buffer.size()); memset(&packet.name, '\n', MAX_NAME_SIZE + 1); memcpy(&packet, buffer.data(), bytesToCopy);