Peter M. Groen / openbr

Commit 1891dd47aa1f1065a832628a5b2ccbc024951fe6

Authored by Scott Klum
2 parents cd57ef8c 9cfbe4a6

Fixed merge problems

Inline Side-by-side
Showing 1 changed file with 10 additions and 0 deletions
sdk/plugins/stasm.cpp
  View file @1891dd4
1 1 #include <QProcess>
  2 +<<<<<<< HEAD
2 3 #include <stasm_dll.hpp>
3 4 #include <opencv2/highgui/highgui.hpp>
  5 +=======
  6 +
  7 +#include <stasm/stasm_dll.hpp>
  8 +
  9 +#include <opencv2/highgui/highgui.hpp>
  10 +
  11 +>>>>>>> 9cfbe4a6bc2e683ed8be044b5007ddcfcfcfcd23
4 12 #include <openbr_plugin.h>
5 13  
6 14 using namespace cv;
... ... @@ -58,6 +66,8 @@ class StasmTransform : public UntrainableTransform
58 66 src.file.name.toStdString().c_str(), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
59 67 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"));
60 68  
  69 +
  70 +
61 71 if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks");
62 72  
63 73 for (int i = 0; i < nlandmarks; i++)
... ...