diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
| commit | e29f9b9b1ede2967031255a7bd23625aedc493c3 (patch) | |
| tree | dfb9ce531ec84db3b251d15bfa800d05abfef272 /facetracknoir/ui.cpp | |
| parent | a084a26275c1b5b0ddc5547ed230fa0b244598d6 (diff) | |
work around global 'ptr' symbol clash with opencv
Issue: #89
Reported-by: @runningman84
Diffstat (limited to 'facetracknoir/ui.cpp')
| -rw-r--r-- | facetracknoir/ui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |