Commit 79ac19ccc907f609833fbd2d7b03d8c1b2668b6a
1 parent
ed60a517
tweaks
Showing
4 changed files
with
4 additions
and
9 deletions
.gitignore
| @@ -42,11 +42,7 @@ data/INRIAPerson/sigset | @@ -42,11 +42,7 @@ data/INRIAPerson/sigset | ||
| 42 | data/KTH/sigset | 42 | data/KTH/sigset |
| 43 | data/CaltechPedestrians/annotations | 43 | data/CaltechPedestrians/annotations |
| 44 | 44 | ||
| 45 | - | ||
| 46 | -CMakeCache.txt | ||
| 47 | - | 45 | +### Sublime ### |
| 48 | *.check_cache | 46 | *.check_cache |
| 49 | - | ||
| 50 | *.sublime-project | 47 | *.sublime-project |
| 51 | - | ||
| 52 | *.sublime-workspace | 48 | *.sublime-workspace |
3rdparty/stasm4.0.0/stasm/stasm.h
| @@ -30,7 +30,7 @@ static const char* const STASM_VERSION = "4.0.0" | @@ -30,7 +30,7 @@ static const char* const STASM_VERSION = "4.0.0" | ||
| 30 | #pragma warning(disable:4267) | 30 | #pragma warning(disable:4267) |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | -#include <opencv/cv.h> | 33 | +#include "opencv/cv.h" |
| 34 | 34 | ||
| 35 | #if _MSC_VER >= 1200 | 35 | #if _MSC_VER >= 1200 |
| 36 | #pragma warning(default:4996) // re-enable the warnings disabled above | 36 | #pragma warning(default:4996) // re-enable the warnings disabled above |
app/CMakeLists.txt
openbr/plugins/mask.cpp
| @@ -165,8 +165,7 @@ class LargestConvexAreaTransform : public UntrainableTransform | @@ -165,8 +165,7 @@ class LargestConvexAreaTransform : public UntrainableTransform | ||
| 165 | void project(const Template &src, Template &dst) const | 165 | void project(const Template &src, Template &dst) const |
| 166 | { | 166 | { |
| 167 | std::vector< std::vector<Point> > contours; | 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 | double maxArea = 0; | 169 | double maxArea = 0; |
| 171 | foreach (const std::vector<Point> &contour, contours) { | 170 | foreach (const std::vector<Point> &contour, contours) { |
| 172 | std::vector<Point> hull; | 171 | std::vector<Point> hull; |