diff --git a/.gitignore b/.gitignore index 8847691..7fd92b6 100644 --- a/.gitignore +++ b/.gitignore @@ -42,11 +42,7 @@ data/INRIAPerson/sigset data/KTH/sigset data/CaltechPedestrians/annotations - -CMakeCache.txt - +### Sublime ### *.check_cache - *.sublime-project - *.sublime-workspace diff --git a/3rdparty/stasm4.0.0/stasm/stasm.h b/3rdparty/stasm4.0.0/stasm/stasm.h index d4fb39b..2161bf8 100755 --- a/3rdparty/stasm4.0.0/stasm/stasm.h +++ b/3rdparty/stasm4.0.0/stasm/stasm.h @@ -30,7 +30,7 @@ static const char* const STASM_VERSION = "4.0.0" #pragma warning(disable:4267) #endif -#include +#include "opencv/cv.h" #if _MSC_VER >= 1200 #pragma warning(default:4996) // re-enable the warnings disabled above diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 78e82ec..075f48c 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -6,5 +6,5 @@ add_subdirectory(examples) # Build OpenBR GUI application if(NOT ${BR_EMBEDDED}) - add_subdirectory(br-gui) + add_subdirectory(br-gui) endif() diff --git a/openbr/plugins/mask.cpp b/openbr/plugins/mask.cpp index cad3ff4..6898c70 100644 --- a/openbr/plugins/mask.cpp +++ b/openbr/plugins/mask.cpp @@ -165,8 +165,7 @@ class LargestConvexAreaTransform : public UntrainableTransform void project(const Template &src, Template &dst) const { std::vector< std::vector > contours; - // TODO: Needs fixed, src.clone is a br_template and not opencv array, so this call makes no sense? - // findContours(src.clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE); + findContours(src.m().clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE); double maxArea = 0; foreach (const std::vector &contour, contours) { std::vector hull;