third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed defects from Xcode

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-02-23 21:07:20 +04:00
parent 32eb38ec98
commit ce0557ebb8
11 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/erfilter.cpp
+1 -2
View File
@@ -294,7 +294,7 @@ void ERFilterNM::er_tree_extract( InputArray image )
push_new_component = false;
// explore the (remaining) edges to the neighbors to the current pixel
for (current_edge = current_edge; current_edge < 4; current_edge++)
for ( ; current_edge < 4; current_edge++)
{
int neighbour_pixel = current_pixel;
@@ -1949,7 +1949,6 @@ private:
double (dissimilarity::*distfn) (const int_fast32_t, const int_fast32_t) const;
auto_array_ptr<double> precomputed;
double * precomputed2;
double * V;
const double * V_data;
modules/objdetect/test/test_cascadeandhog.cpp
+4 -2
View File
@@ -574,7 +574,7 @@ public:
Size winStride = Size(), Size padding = Size(),
const vector<Point>& locations = vector<Point>()) const;
virtual void compute(const Mat& img, vector<float>& descriptors,
virtual void compute(InputArray img, vector<float>& descriptors,
Size winStride = Size(), Size padding = Size(),
const vector<Point>& locations = vector<Point>()) const;
@@ -1107,9 +1107,11 @@ void HOGDescriptorTester::detect(const Mat& img, vector<Point>& hits, double hit
detect(img, hits, weightsV, hitThreshold, winStride, padding, locations);
}
void HOGDescriptorTester::compute(const Mat& img, vector<float>& descriptors,
void HOGDescriptorTester::compute(InputArray _img, vector<float>& descriptors,
Size winStride, Size padding, const vector<Point>& locations) const
{
Mat img = _img.getMat();
if( winStride == Size() )
winStride = cellSize;
Size cacheStride(gcd(winStride.width, blockStride.width),