WebSVN – seema-scanner – Diff – /src/cvtools.cpp

     line_type = type == CV_8UC1 || type == CV_8UC3 ? CV_AA : 8;
     if( !found )
+    {
-        CvScalar color = {{0,0,255}};
+        cv::Scalar color = {0,0,255};
         if( cn == 1 )
             color = cvScalarAll(200);
         color.val[0] *= scale;
         color.val[1] *= scale;
         color.val[2] *= scale;
     else
+    {
         int x, y;
         CvPoint prev_pt = {0, 0};
         const int line_max = 7;
-        static const CvScalar line_colors[line_max] =
+        static const cv::Scalar line_colors[line_max] =
+        {
-            {{0,0,255}},
+            {0,0,255},
-            {{0,128,255}},
+            {0,128,255},
-            {{0,200,200}},
+            {0,200,200},
-            {{0,255,0}},
+            {0,255,0},
-            {{200,200,0}},
+            {200,200,0},
-            {{255,0,0}},
+            {255,0,0},
-            {{255,0,255}}
+            {255,0,255}
         };
         for( y = 0, i = 0; y < pattern_size.height; y++ )
+        {
-            CvScalar color = line_colors[y % line_max];
+            cv::Scalar color = line_colors[y % line_max];
             if( cn == 1 )
                 color = cvScalarAll(200);
             color.val[0] *= scale;
             color.val[1] *= scale;
             color.val[2] *= scale;

Subversion Repositories seema-scanner