merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/modules/legacy/src/texture.cpp
+++ b/modules/legacy/src/texture.cpp
@@ -469,7 +469,7 @@ icvCreateGLCMDescriptors_AllowDoubleNest( CvGLCM* destGLCM, int matrixIndex )
            descriptors[ CV_GLCMDESC_ENERGY ] += entryValue*entryValue;
        }

-        if( marginalProbability>0 )
+        if( marginalProbability[ actualSideLoop1 ] > 0 )
            marginalProbabilityEntropy += marginalProbability[ actualSideLoop1 ]*log(marginalProbability[ actualSideLoop1 ]);
    }