Merge pull request #856 from ericgreveson:master

12 years ago · 1fe7ad850b
parent 173442bb2e e7995b4d5d
commit 1fe7ad850b
1 changed files with 2 additions and 2 deletions
--- a/modules/imgproc/src/histogram.cpp
+++ b/modules/imgproc/src/histogram.cpp
@ -1970,7 +1970,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method )
    double result = 0;
    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;

@ -1980,7 +1980,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method )
    {
        const float* h1 = (const float*)it.planes[0].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 )
        {