diff --git a/modules/cudawarping/test/test_warp_affine.cpp b/modules/cudawarping/test/test_warp_affine.cpp index f4a08ab928..d26a5fdeb7 100644 --- a/modules/cudawarping/test/test_warp_affine.cpp +++ b/modules/cudawarping/test/test_warp_affine.cpp @@ -48,7 +48,7 @@ namespace opencv_test { namespace { namespace { - cv::Mat createTransfomMatrix(cv::Size srcSize, double angle) + cv::Mat createTransformMatrix(cv::Size srcSize, double angle) { cv::Mat M(2, 3, CV_64FC1); @@ -80,7 +80,7 @@ PARAM_TEST_CASE(BuildWarpAffineMaps, cv::cuda::DeviceInfo, cv::Size, Inverse) CUDA_TEST_P(BuildWarpAffineMaps, Accuracy) { - cv::Mat M = createTransfomMatrix(size, CV_PI / 4); + cv::Mat M = createTransformMatrix(size, CV_PI / 4); cv::Mat src = randomMat(randomSize(200, 400), CV_8UC1); cv::cuda::GpuMat xmap, ymap; @@ -207,7 +207,7 @@ PARAM_TEST_CASE(WarpAffine, cv::cuda::DeviceInfo, cv::Size, MatType, Inverse, In CUDA_TEST_P(WarpAffine, Accuracy) { cv::Mat src = randomMat(size, type); - cv::Mat M = createTransfomMatrix(size, CV_PI / 3); + cv::Mat M = createTransformMatrix(size, CV_PI / 3); int flags = interpolation; if (inverse) flags |= cv::WARP_INVERSE_MAP; @@ -257,7 +257,7 @@ CUDA_TEST_P(WarpAffineNPP, Accuracy) cv::Mat src = readImageType("stereobp/aloe-L.png", type); ASSERT_FALSE(src.empty()); - cv::Mat M = createTransfomMatrix(src.size(), CV_PI / 4); + cv::Mat M = createTransformMatrix(src.size(), CV_PI / 4); int flags = interpolation; if (inverse) flags |= cv::WARP_INVERSE_MAP; diff --git a/modules/cudawarping/test/test_warp_perspective.cpp b/modules/cudawarping/test/test_warp_perspective.cpp index 046a334764..7c5c758892 100644 --- a/modules/cudawarping/test/test_warp_perspective.cpp +++ b/modules/cudawarping/test/test_warp_perspective.cpp @@ -48,7 +48,7 @@ namespace opencv_test { namespace { namespace { - cv::Mat createTransfomMatrix(cv::Size srcSize, double angle) + cv::Mat createTransformMatrix(cv::Size srcSize, double angle) { cv::Mat M(3, 3, CV_64FC1); @@ -81,7 +81,7 @@ PARAM_TEST_CASE(BuildWarpPerspectiveMaps, cv::cuda::DeviceInfo, cv::Size, Invers CUDA_TEST_P(BuildWarpPerspectiveMaps, Accuracy) { - cv::Mat M = createTransfomMatrix(size, CV_PI / 4); + cv::Mat M = createTransformMatrix(size, CV_PI / 4); cv::cuda::GpuMat xmap, ymap; cv::cuda::buildWarpPerspectiveMaps(M, inverse, size, xmap, ymap); @@ -210,7 +210,7 @@ PARAM_TEST_CASE(WarpPerspective, cv::cuda::DeviceInfo, cv::Size, MatType, Invers CUDA_TEST_P(WarpPerspective, Accuracy) { cv::Mat src = randomMat(size, type); - cv::Mat M = createTransfomMatrix(size, CV_PI / 3); + cv::Mat M = createTransformMatrix(size, CV_PI / 3); int flags = interpolation; if (inverse) flags |= cv::WARP_INVERSE_MAP; @@ -260,7 +260,7 @@ CUDA_TEST_P(WarpPerspectiveNPP, Accuracy) cv::Mat src = readImageType("stereobp/aloe-L.png", type); ASSERT_FALSE(src.empty()); - cv::Mat M = createTransfomMatrix(src.size(), CV_PI / 4); + cv::Mat M = createTransformMatrix(src.size(), CV_PI / 4); int flags = interpolation; if (inverse) flags |= cv::WARP_INVERSE_MAP; diff --git a/modules/cudev/test/test_warp.cu b/modules/cudev/test/test_warp.cu index eda1694860..72d0643148 100644 --- a/modules/cudev/test/test_warp.cu +++ b/modules/cudev/test/test_warp.cu @@ -199,7 +199,7 @@ TEST(Resize, Downscale) // warpAffine & warpPerspective -Mat createAffineTransfomMatrix(Size srcSize, float angle, bool perspective) +Mat createAffineTransformMatrix(Size srcSize, float angle, bool perspective) { cv::Mat M(perspective ? 3 : 2, 3, CV_32FC1); @@ -220,7 +220,7 @@ TEST(WarpAffine, Rotation) const Size size = randomSize(100, 400); Mat src = randomMat(size, CV_32FC1, 0, 1); - Mat M = createAffineTransfomMatrix(size, static_cast(CV_PI / 4), false); + Mat M = createAffineTransformMatrix(size, static_cast(CV_PI / 4), false); GpuMat_ d_src(src); GpuMat_ d_M; @@ -240,7 +240,7 @@ TEST(WarpPerspective, Rotation) const Size size = randomSize(100, 400); Mat src = randomMat(size, CV_32FC1, 0, 1); - Mat M = createAffineTransfomMatrix(size, static_cast(CV_PI / 4), true); + Mat M = createAffineTransformMatrix(size, static_cast(CV_PI / 4), true); GpuMat_ d_src(src); GpuMat_ d_M; diff --git a/modules/objdetect/src/hog.cpp b/modules/objdetect/src/hog.cpp index 8fc18f467f..4bd9596c1d 100644 --- a/modules/objdetect/src/hog.cpp +++ b/modules/objdetect/src/hog.cpp @@ -255,8 +255,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle, Mat_ _lut(1, 256); const float* const lut = &_lut(0,0); #if CV_SSE2 - const int indeces[] = { 0, 1, 2, 3 }; - __m128i idx = _mm_loadu_si128((const __m128i*)indeces); + const int indices[] = { 0, 1, 2, 3 }; + __m128i idx = _mm_loadu_si128((const __m128i*)indices); __m128i ifour = _mm_set1_epi32(4); float* const _data = &_lut(0, 0); @@ -273,8 +273,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle, idx = _mm_add_epi32(idx, ifour); } #elif CV_NEON - const int indeces[] = { 0, 1, 2, 3 }; - uint32x4_t idx = *(uint32x4_t*)indeces; + const int indices[] = { 0, 1, 2, 3 }; + uint32x4_t idx = *(uint32x4_t*)indices; uint32x4_t ifour = vdupq_n_u32(4); float* const _data = &_lut(0, 0);