Commit 79ac19ccc907f609833fbd2d7b03d8c1b2668b6a

Authored by Josh Klontz
1 parent ed60a517

tweaks

.gitignore
... ... @@ -42,11 +42,7 @@ data/INRIAPerson/sigset
42 42 data/KTH/sigset
43 43 data/CaltechPedestrians/annotations
44 44  
45   -
46   -CMakeCache.txt
47   -
  45 +### Sublime ###
48 46 *.check_cache
49   -
50 47 *.sublime-project
51   -
52 48 *.sublime-workspace
... ...
3rdparty/stasm4.0.0/stasm/stasm.h
... ... @@ -30,7 +30,7 @@ static const char* const STASM_VERSION = "4.0.0"
30 30 #pragma warning(disable:4267)
31 31 #endif
32 32  
33   -#include <opencv/cv.h>
  33 +#include "opencv/cv.h"
34 34  
35 35 #if _MSC_VER >= 1200
36 36 #pragma warning(default:4996) // re-enable the warnings disabled above
... ...
app/CMakeLists.txt
... ... @@ -6,5 +6,5 @@ add_subdirectory(examples)
6 6  
7 7 # Build OpenBR GUI application
8 8 if(NOT ${BR_EMBEDDED})
9   - add_subdirectory(br-gui)
  9 + add_subdirectory(br-gui)
10 10 endif()
... ...
openbr/plugins/mask.cpp
... ... @@ -165,8 +165,7 @@ class LargestConvexAreaTransform : public UntrainableTransform
165 165 void project(const Template &src, Template &dst) const
166 166 {
167 167 std::vector< std::vector<Point> > contours;
168   - // TODO: Needs fixed, src.clone is a br_template and not opencv array, so this call makes no sense?
169   - // findContours(src.clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);
  168 + findContours(src.m().clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);
170 169 double maxArea = 0;
171 170 foreach (const std::vector<Point> &contour, contours) {
172 171 std::vector<Point> hull;
... ...