Commit aa1842cc42e87ba59d310389fe3a96cc855a3f42
1 parent
1891dd47
Stupidity reversed
Showing
1 changed file
with
0 additions
and
7 deletions
sdk/plugins/stasm.cpp
| 1 | 1 | #include <QProcess> |
| 2 | -<<<<<<< HEAD | |
| 3 | 2 | #include <stasm_dll.hpp> |
| 4 | 3 | #include <opencv2/highgui/highgui.hpp> |
| 5 | -======= | |
| 6 | - | |
| 7 | -#include <stasm/stasm_dll.hpp> | |
| 8 | 4 | |
| 9 | 5 | #include <opencv2/highgui/highgui.hpp> |
| 10 | 6 | |
| 11 | ->>>>>>> 9cfbe4a6bc2e683ed8be044b5007ddcfcfcfcd23 | |
| 12 | 7 | #include <openbr_plugin.h> |
| 13 | 8 | |
| 14 | 9 | using namespace cv; |
| ... | ... | @@ -66,8 +61,6 @@ class StasmTransform : public UntrainableTransform |
| 66 | 61 | src.file.name.toStdString().c_str(), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows, |
| 67 | 62 | src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf")); |
| 68 | 63 | |
| 69 | - | |
| 70 | - | |
| 71 | 64 | if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks"); |
| 72 | 65 | |
| 73 | 66 | for (int i = 0; i < nlandmarks; i++) | ... | ... |