Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00
parent 70166820ea
commit e1c4fd9e1f
52 changed files with 1750 additions and 622 deletions
--- a/modules/imgproc/src/accum.cpp
+++ b/modules/imgproc/src/accum.cpp
@@ -272,7 +272,7 @@ accW_( const T* src, AT* dst, const uchar* mask, int len, int cn, double alpha )
            if( mask[i] )
            {
                for( int k = 0; k < cn; k++ )
-                    dst[k] += src[k]*a + dst[k]*b;
+                    dst[k] = src[k]*a + dst[k]*b;
            }
    }
 }