diff --git a/interface/src/devices/Visage.cpp b/interface/src/devices/Visage.cpp index 4d1ea2b40b..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); @@ -37,9 +38,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();