From ecb54600ebde2621db2e1797f43e8a4aca1ef585 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 11 Mar 2014 15:34:41 -0700 Subject: [PATCH 1/2] Another compile fix. --- interface/src/devices/Visage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/devices/Visage.cpp b/interface/src/devices/Visage.cpp index 4d1ea2b40b..2f1e6e745a 100644 --- a/interface/src/devices/Visage.cpp +++ b/interface/src/devices/Visage.cpp @@ -37,9 +37,9 @@ Visage::Visage() : _estimatedEyeYaw(0.0f) { #ifdef HAVE_VISAGE - QByteArray licensePath = Application::resourcesPath() + "visage/license.vlc"; + QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage/license.vlc"; initializeLicenseManager(licensePath.data()); - _tracker = new VisageTracker2(Application::resourcesPath() + "visage/tracker.cfg"); + _tracker = new VisageTracker2(Application::resourcesPath().toLatin1() + "visage/tracker.cfg"); if (_tracker->trackFromCam()) { _data = new FaceData(); From 8d69eff86744c877681f3f84dd022c8563523bac Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 11 Mar 2014 15:38:19 -0700 Subject: [PATCH 2/2] Need to reorder includes due to HANDLE definition conflict. --- interface/src/devices/Visage.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/devices/Visage.cpp b/interface/src/devices/Visage.cpp index 2f1e6e745a..727c083265 100644 --- a/interface/src/devices/Visage.cpp +++ b/interface/src/devices/Visage.cpp @@ -10,14 +10,15 @@ #include -#ifdef HAVE_VISAGE -#include -#endif - #include "Application.h" #include "Visage.h" #include "renderer/FBXReader.h" +// this has to go after our normal includes, because its definition of HANDLE conflicts with Qt's +#ifdef HAVE_VISAGE +#include +#endif + namespace VisageSDK { #ifdef WIN32 void __declspec(dllimport) initializeLicenseManager(char* licenseKeyFileName);