diff --git a/conformity/opencv/test_exp.cpp b/conformity/opencv/test_exp.cpp index eb97c96ac5d4c23758498efc0afdc1e83c2a0da8..9aed0eb981fe601230a684e8bfffbd5186b8a3f6 100644 --- a/conformity/opencv/test_exp.cpp +++ b/conformity/opencv/test_exp.cpp @@ -35,6 +35,7 @@ bool test_exp(int index, RecreatedMessageQueue& request_queue, // range is defined if (are_float_matrices_different(1.5, expected_mat, actual_mat)) { fail_print_matrices(x, y, input_mat, actual_mat, expected_mat); + return true; } } } diff --git a/conformity/opencv/test_float_conv.cpp b/conformity/opencv/test_float_conv.cpp index 13e8c88121c238ec941cfc07c70d8ef605224349..ae091b82aa45472848d2a80ceb6486f7da624911 100644 --- a/conformity/opencv/test_float_conv.cpp +++ b/conformity/opencv/test_float_conv.cpp @@ -202,7 +202,7 @@ std::vector& float_conversion_tests_get() { TEST("Unsigned Int8 to Float32, random, 4 channel", (test_int8_to_float32_random), exec_int8_to_float32), TEST("Signed Int8 to Float32, custom", test_int8_to_float32_custom, exec_int8_to_float32), - TEST("Unigned Int8 to Float32, custom", test_int8_to_float32_custom, exec_int8_to_float32), + TEST("Unsigned Int8 to Float32, custom", test_int8_to_float32_custom, exec_int8_to_float32), }; // clang-format on return tests; diff --git a/conformity/opencv/test_scale.cpp b/conformity/opencv/test_scale.cpp index f669f1fa35b1e36a09c537aec8ae72b68f3650e1..5948ffb1847e8eef780b735c711d475bc6fcba2a 100644 --- a/conformity/opencv/test_scale.cpp +++ b/conformity/opencv/test_scale.cpp @@ -38,6 +38,7 @@ bool test_scale(int index, RecreatedMessageQueue& request_queue, !are_matrices_different(0, actual_mat, expected_mat)); if (!success) { fail_print_matrices(x, y, input_mat, actual_mat, expected_mat); + return true; } } } @@ -50,15 +51,15 @@ std::vector& scale_tests_get() { // clang-format off static std::vector tests = { TEST("Scale float32, scale=1.0, shift=2.0", (test_scale<1000, 2000, CV_32FC4>), (exec_scale<1000, 2000>)), - TEST("Scale float32, scale=-10.0, shift=0.0", (test_scale<(-10000), 0, CV_32FC4>), (exec_scale<(-10000), 0>)), - TEST("Scale float32, scale=3.14, shift=2.72", (test_scale<3140, 2720, CV_32FC4>), (exec_scale<3140, 2720>)), - TEST("Scale float32, scale=7e5, shift=8e-3", (test_scale<700000000, 8, CV_32FC4>), (exec_scale<700000000, 8>)), + TEST("Scale float32, scale=-10.0, shift=0.0", (test_scale<(-10000), 0, CV_32FC1>), (exec_scale<(-10000), 0>)), + TEST("Scale float32, scale=3.14, shift=2.72", (test_scale<3140, 2720, CV_32FC2>), (exec_scale<3140, 2720>)), + TEST("Scale float32, scale=7e5, shift=8e-3", (test_scale<700000000, 8, CV_32FC3>), (exec_scale<700000000, 8>)), TEST("Scale float32, scale=1e-3, shift=8e-3", (test_scale<1, 8, CV_32FC4>), (exec_scale<1, 8>)), TEST("Scale uint8, scale=1.0, shift=2.0", (test_scale<1000, 2000, CV_8UC4>), (exec_scale<1000, 2000>)), - TEST("Scale uint8, scale=-10.0, shift=0.0", (test_scale<(-10000), 0, CV_8UC4>), (exec_scale<(-10000), 0>)), - TEST("Scale uint8, scale=3.14, shift=-2.72", (test_scale<3140, -2720, CV_8UC4>), (exec_scale<3140, -2720>)), - TEST("Scale uint8, scale=17.17, shift=3.9", (test_scale<17170, 3900, CV_8UC4>), (exec_scale<17170, 3900>)), + TEST("Scale uint8, scale=-10.0, shift=0.0", (test_scale<(-10000), 0, CV_8UC1>), (exec_scale<(-10000), 0>)), + TEST("Scale uint8, scale=3.14, shift=-2.72", (test_scale<3140, -2720, CV_8UC2>), (exec_scale<3140, -2720>)), + TEST("Scale uint8, scale=17.17, shift=3.9", (test_scale<17170, 3900, CV_8UC3>), (exec_scale<17170, 3900>)), TEST("Scale uint8, scale=0.13, shift=230", (test_scale<130, 230000, CV_8UC4>), (exec_scale<130, 230000>)), }; // clang-format on