Move cv::Scalar_ to types.hpp

2013-03-27 14:58:57 +04:00
parent 6ceca90c44
commit 5e7ab8baf3
13 changed files with 131 additions and 110 deletions
--- a/modules/imgproc/test/test_templmatch.cpp
+++ b/modules/imgproc/test/test_templmatch.cpp
@@ -192,8 +192,8 @@ static void cvTsMatchTemplate( const CvMat* img, const CvMat* templ, CvMat* resu
    {
        for( j = 0; j < result->cols; j++ )
        {
-            CvScalar a_sum = {{ 0, 0, 0, 0 }}, a_sum2 = {{ 0, 0, 0, 0 }};
-            CvScalar ccorr = {{ 0, 0, 0, 0 }};
+            CvScalar a_sum(0), a_sum2(0);
+            CvScalar ccorr(0);
            double value = 0.;

            if( depth == CV_8U )