fixed some more tests on Windows; changed inheritance Matx -> Vec to Vec -> Matx

2010-11-06 21:51:21 +00:00
parent 5a53d82e30
commit d8ace43753
13 changed files with 655 additions and 648 deletions
--- a/modules/core/src/precomp.hpp
+++ b/modules/core/src/precomp.hpp
@@ -325,7 +325,7 @@ binarySOpCn_( const Mat& srcmat, Mat& dstmat, const Scalar& _scalar )
    int cn = dstmat.channels();
    Size size = getContinuousSize( srcmat, dstmat, cn );
    WT scalar[12];
-    _scalar.convertTo(scalar, cn, 12);
+    scalarToRawData(_scalar, scalar, CV_MAKETYPE(DataType<WT>::depth,cn), 12);

    for( ; size.height--; src0 += step1, dst0 += step )
    {