From e29f9b9b1ede2967031255a7bd23625aedc493c3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 29 Oct 2014 01:09:49 +0100
Subject: work around global 'ptr' symbol clash with opencv

Issue: #89
Reported-by: @runningman84
---
 facetracknoir/ui.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'facetracknoir/ui.cpp')

diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index f340b1ff..66e7c80f 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -330,11 +330,11 @@ void MainWindow::showHeadPose()
 }
 
 template<typename t>
-ptr<t> mk_dialog(ptr<dylib> lib)
+mem<t> mk_dialog(mem<dylib> lib)
 {
     if (lib)
     {
-        auto dialog = ptr<t>(reinterpret_cast<t*>(lib->Dialog()));
+        auto dialog = mem<t>(reinterpret_cast<t*>(lib->Dialog()));
         dialog->setWindowFlags(Qt::Dialog);
         dialog->setFixedSize(dialog->size());
         return dialog;
-- 
cgit v1.2.3