generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #856 from ericgreveson:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-06-10 15:25:07 +04:00 committed by OpenCV Buildbot
commit 1fe7ad850b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/histogram.cpp
View File

@ -1970,7 +1970,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method )
double result = 0; double result = 0;
int j, len = (int)it.size; int j, len = (int)it.size;
CV_Assert( H1.type() == H2.type() && H1.type() == CV_32F ); CV_Assert( H1.type() == H2.type() && H1.depth() == CV_32F );
double s1 = 0, s2 = 0, s11 = 0, s12 = 0, s22 = 0; double s1 = 0, s2 = 0, s11 = 0, s12 = 0, s22 = 0;
@ -1980,7 +1980,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method )
{ {
const float* h1 = (const float*)it.planes[0].data; const float* h1 = (const float*)it.planes[0].data;
const float* h2 = (const float*)it.planes[1].data; const float* h2 = (const float*)it.planes[1].data;
len = it.planes[0].rows*it.planes[0].cols; len = it.planes[0].rows*it.planes[0].cols*H1.channels();
if( method == CV_COMP_CHISQR ) if( method == CV_COMP_CHISQR )
{ {