fixed a few performance tests (they have not been executed)

git-svn-id: https://code.ros.org/svn/opencv/trunk@679 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/tests/cxcore/src/aarithm.cpp b/opencv/tests/cxcore/src/aarithm.cpp
index 8af52ee8c71f9354779c45cde04aa7dff61a2b7e..bddefd46cab3f7766f189c83af7c87d9aa727bb7 100644 (file)
--- a/opencv/tests/cxcore/src/aarithm.cpp
+++ b/opencv/tests/cxcore/src/aarithm.cpp
@@ -1952,7 +1952,7 @@ CxCore_InRangeSTest inranges_test;
 /////////////////////////// convertscale[abs] ////////////////////////////////////////
 
 static const char* cvt_param_names[] = { "size", "scale", "dst_depth", "depth", 0 };
-static const char* cvt_abs_param_names[] = { "size", "depth" };
+static const char* cvt_abs_param_names[] = { "size", "depth", 0 };
 static const int cvt_scale_flags[] = { 0, 1 };
 
 class CxCore_CvtBaseTestImpl : public CxCore_ArithmTestImpl

diff --git a/opencv/tests/cxcore/src/adxt.cpp b/opencv/tests/cxcore/src/adxt.cpp
index 26bf42529743ae3ebe7e3449fe9534cab71268c8..4ccfdb30c95a18252feed3732bc8d76ec1306260 100644 (file)
--- a/opencv/tests/cxcore/src/adxt.cpp
+++ b/opencv/tests/cxcore/src/adxt.cpp
@@ -496,7 +496,7 @@ static void cvTsFixCCS( CvMat* mat, int cols, int flags )
 static const CvSize dxt_sizes[] = {{16,1}, {256,1}, {1024,1}, {65536,1},
     {10,1}, {100,1}, {1000,1}, {100000,1}, {256, 256}, {1024,1024}, {-1,-1}};
 static const int dxt_depths[] = { CV_32F, CV_64F, -1 };
-static const char* dxt_param_names[] = { "size", "depth", "transform_type" };
+static const char* dxt_param_names[] = { "size", "depth", "transform_type", 0 };
 static const char* dft_transforms[] = { "Fwd_CToC", "Inv_CToC", "Fwd_RToPack", "Inv_PackToR", 0 };
 static const char* mulsp_transforms[] = { "Fwd_CToC", "Fwd_RToPack", 0 };
 static const char* dct_transforms[] = { "Fwd", "Inv", 0 };

diff --git a/opencv/tests/cxcore/src/amath.cpp b/opencv/tests/cxcore/src/amath.cpp
index eb5e8145272f1aafb6d9dd107542140cd408958b..051426a425ceea7203e6dc55369985b7972668c2 100644 (file)
--- a/opencv/tests/cxcore/src/amath.cpp
+++ b/opencv/tests/cxcore/src/amath.cpp
@@ -57,7 +57,7 @@
 
 static const CvSize math_sizes[] = {{10,1}, {100,1}, {10000,1}, {-1,-1}};
 static const int math_depths[] = { CV_32F, CV_64F, -1 };
-static const char* math_param_names[] = { "size", "depth" };
+static const char* math_param_names[] = { "size", "depth", 0 };
 
 static const CvSize matrix_sizes[] = {{3,3}, {4,4}, {10,10}, {30,30}, {100,100}, {500,500}, {-1,-1}};
 
@@ -301,7 +301,7 @@ CxCore_LogTest log_test;
 ////////// pow /////////////
 
 static const double math_pow_values[] = { 2., 5., 0.5, -0.5, 1./3, -1./3, CV_PI };
-static const char* math_pow_param_names[] = { "size", "power", "depth" };
+static const char* math_pow_param_names[] = { "size", "power", "depth", 0 };
 static const int math_pow_depths[] = { CV_8U, CV_16U, CV_16S, CV_32S, CV_32F, CV_64F, -1 };
 
 class CxCore_PowTest : public CxCore_MathTest
@@ -1256,7 +1256,7 @@ CxCore_ScaleAddTest scaleadd_test;
 
 ///////////////// gemm /////////////////////
 
-static const char* matrix_gemm_param_names[] = { "size", "add_c", "mul_type", "depth" };
+static const char* matrix_gemm_param_names[] = { "size", "add_c", "mul_type", "depth", 0 };
 static const char* matrix_gemm_mul_types[] = { "AB", "AtB", "ABt", "AtBt", 0 };
 static const int matrix_gemm_add_c_flags[] = { 0, 1 };
 
@@ -1421,7 +1421,7 @@ CxCore_GEMMTest gemm_test;
 
 ///////////////// multransposed /////////////////////
 
-static const char* matrix_multrans_param_names[] = { "size", "use_delta", "mul_type", "depth" };
+static const char* matrix_multrans_param_names[] = { "size", "use_delta", "mul_type", "depth", 0 };
 static const int matrix_multrans_use_delta_flags[] = { 0, 1 };
 static const char* matrix_multrans_mul_types[] = { "AAt", "AtA", 0 };
 
@@ -1567,7 +1567,7 @@ CxCore_MulTransposedTest multransposed_test;
 static const CvSize matrix_transform_sizes[] = {{10,10}, {100,100}, {720,480}, {-1,-1}};
 static const CvSize matrix_transform_whole_sizes[] = {{10,10}, {720,480}, {720,480}, {-1,-1}};
 static const int matrix_transform_channels[] = { 2, 3, 4, -1 };
-static const char* matrix_transform_param_names[] = { "size", "channels", "depth" };
+static const char* matrix_transform_param_names[] = { "size", "channels", "depth", 0 };
 
 class CxCore_TransformTest : public CxCore_MatrixTest
 {
@@ -2298,7 +2298,7 @@ CxCore_DetTest det_test;
 
 ///////////////// invert /////////////////////
 
-static const char* matrix_solve_invert_param_names[] = { "size", "method", "depth" };
+static const char* matrix_solve_invert_param_names[] = { "size", "method", "depth", 0 };
 static const char* matrix_solve_invert_methods[] = { "LU", "SVD", 0 };
 
 class CxCore_InvertTest : public CxCore_MatrixTest
@@ -2656,7 +2656,7 @@ CxCore_SolveTest solve_test;
 
 ///////////////// SVD /////////////////////
 
-static const char* matrix_svd_param_names[] = { "size", "output", "depth" };
+static const char* matrix_svd_param_names[] = { "size", "output", "depth", 0 };
 static const char* matrix_svd_output_modes[] = { "w", "all", 0 };
 
 class CxCore_SVDTest : public CxCore_MatrixTest