Merged the trunk r8291:8321

2012-05-18 12:34:01 +00:00
parent 50ad690993
commit c3577a288b
7 changed files with 87 additions and 44 deletions
--- a/modules/core/test/test_arithm.cpp
+++ b/modules/core/test/test_arithm.cpp
@@ -1504,6 +1504,14 @@ protected:
                d.convertTo(d1, depth);
                CV_Assert( norm(c, d1, CV_C) <= DBL_EPSILON );
            }
+            
+            Mat_<uchar> tmpSrc(100,100);
+            tmpSrc = 124;
+            Mat_<uchar> tmpMask(100,100);
+            tmpMask = 255;
+            Mat_<uchar> tmpDst(100,100);
+            tmpDst = 2;
+            tmpSrc.copyTo(tmpDst,tmpMask);
        }
        catch(...)
        {