Change names of some internal functions

sovrasov · sovrasov · commit 055f5c73959f · 2016-06-07T10:58:12.000+03:00
diff --git a/modules/core/src/matmul.cpp b/modules/core/src/matmul.cpp
@@ -865,7 +865,7 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,
 }
 #endif
 
-static void _gemmImplInternal( Mat A, Mat B, double alpha,
+static void gemmImpl( Mat A, Mat B, double alpha,
            Mat C, double beta, Mat D, int flags )
 {
     const int block_lin_size = 128;
@@ -1411,7 +1411,7 @@ static void _gemmImplInternal( Mat A, Mat B, double alpha,
 }
 
 template <typename fptype>inline static void
-_callInternalGemmImpl(const fptype *src1, size_t src1_step, const fptype *src2, size_t src2_step, fptype alpha,
+callGemmImpl(const fptype *src1, size_t src1_step, const fptype *src2, size_t src2_step, fptype alpha,
           const fptype *src3, size_t src3_step, fptype beta, fptype *dst, size_t dst_step, int m_a, int n_a, int n_d, int flags, int type)
 {
     CV_StaticAssert(GEMM_1_T == CV_HAL_GEMM_1_T, "Incompatible GEMM_1_T flag in HAL");
@@ -1469,7 +1469,7 @@ _callInternalGemmImpl(const fptype *src1, size_t src1_step, const fptype *src2,
         C = Mat(c_m, c_n, type, (void*)src3, src3_step);
     Mat D(m_d, n_d, type, (void*)dst, dst_step);
 
-    _gemmImplInternal(A, B, alpha, C, beta, D, flags);
+    gemmImpl(A, B, alpha, C, beta, D, flags);
 }
 
 }
@@ -1480,31 +1480,31 @@ void cv::hal::gemm32f(const float* src1, size_t src1_step, const float* src2, si
 {
 
     CALL_HAL(gemm32f, cv_hal_gemm32f, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)
-    _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32F);
+    callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32F);
 }
 
 void cv::hal::gemm64f(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
                         double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
                         int m_a, int n_a, int n_d, int flags)
 {
     CALL_HAL(gemm64f, cv_hal_gemm64f, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)
-    _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64F);
+    callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64F);
 }
 
 CV_EXPORTS void cv::hal::gemm32fc(const float* src1, size_t src1_step, const float* src2, size_t src2_step,
                         float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,
                         int m_a, int n_a, int n_d, int flags)
 {
     CALL_HAL(gemm32fc, cv_hal_gemm32fc, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)
-    _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32FC2);
+    callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32FC2);
 }
 
 CV_EXPORTS void cv::hal::gemm64fc(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
                         double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
                         int m_a, int n_a, int n_d, int flags)
 {
     CALL_HAL(gemm64fc, cv_hal_gemm64fc, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)
-    _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64FC2);
+    callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64FC2);
 }
 
 void cv::gemm( InputArray matA, InputArray matB, double alpha,

Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,`
`865`	`865`	`}`
`866`	`866`	`#endif`
`867`	`867`
`868`		`-static void _gemmImplInternal( Mat A, Mat B, double alpha,`
	`868`	`+static void gemmImpl( Mat A, Mat B, double alpha,`
`869`	`869`	`Mat C, double beta, Mat D, int flags )`
`870`	`870`	`{`
`871`	`871`	`const int block_lin_size = 128;`
`@@ -1411,7 +1411,7 @@ static void _gemmImplInternal( Mat A, Mat B, double alpha,`
`1411`	`1411`	`}`
`1412`	`1412`
`1413`	`1413`	`template <typename fptype>inline static void`
`1414`		`-_callInternalGemmImpl(const fptype src1, size_t src1_step, const fptype src2, size_t src2_step, fptype alpha,`
	`1414`	`+callGemmImpl(const fptype src1, size_t src1_step, const fptype src2, size_t src2_step, fptype alpha,`
`1415`	`1415`	`const fptype src3, size_t src3_step, fptype beta, fptype dst, size_t dst_step, int m_a, int n_a, int n_d, int flags, int type)`
`1416`	`1416`	`{`
`1417`	`1417`	`CV_StaticAssert(GEMM_1_T == CV_HAL_GEMM_1_T, "Incompatible GEMM_1_T flag in HAL");`
`@@ -1469,7 +1469,7 @@ _callInternalGemmImpl(const fptype src1, size_t src1_step, const fptype src2,`
`1469`	`1469`	`C = Mat(c_m, c_n, type, (void*)src3, src3_step);`
`1470`	`1470`	`Mat D(m_d, n_d, type, (void*)dst, dst_step);`
`1471`	`1471`
`1472`		`- _gemmImplInternal(A, B, alpha, C, beta, D, flags);`
	`1472`	`+ gemmImpl(A, B, alpha, C, beta, D, flags);`
`1473`	`1473`	`}`
`1474`	`1474`
`1475`	`1475`	`}`
`@@ -1480,31 +1480,31 @@ void cv::hal::gemm32f(const float* src1, size_t src1_step, const float* src2, si`
`1480`	`1480`	`{`
`1481`	`1481`
`1482`	`1482`	`CALL_HAL(gemm32f, cv_hal_gemm32f, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)`
`1483`		`- _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32F);`
	`1483`	`+ callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32F);`
`1484`	`1484`	`}`
`1485`	`1485`
`1486`	`1486`	`void cv::hal::gemm64f(const double* src1, size_t src1_step, const double* src2, size_t src2_step,`
`1487`	`1487`	`double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,`
`1488`	`1488`	`int m_a, int n_a, int n_d, int flags)`
`1489`	`1489`	`{`
`1490`	`1490`	`CALL_HAL(gemm64f, cv_hal_gemm64f, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)`
`1491`		`- _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64F);`
	`1491`	`+ callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64F);`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`	`1494`	`CV_EXPORTS void cv::hal::gemm32fc(const float* src1, size_t src1_step, const float* src2, size_t src2_step,`
`1495`	`1495`	`float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,`
`1496`	`1496`	`int m_a, int n_a, int n_d, int flags)`
`1497`	`1497`	`{`
`1498`	`1498`	`CALL_HAL(gemm32fc, cv_hal_gemm32fc, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)`
`1499`		`- _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32FC2);`
	`1499`	`+ callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_32FC2);`
`1500`	`1500`	`}`
`1501`	`1501`
`1502`	`1502`	`CV_EXPORTS void cv::hal::gemm64fc(const double* src1, size_t src1_step, const double* src2, size_t src2_step,`
`1503`	`1503`	`double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,`
`1504`	`1504`	`int m_a, int n_a, int n_d, int flags)`
`1505`	`1505`	`{`
`1506`	`1506`	`CALL_HAL(gemm64fc, cv_hal_gemm64fc, src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags)`
`1507`		`- _callInternalGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64FC2);`
	`1507`	`+ callGemmImpl(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m_a, n_a, n_d, flags, CV_64FC2);`
`1508`	`1508`	`}`
`1509`	`1509`
`1510`	`1510`	`void cv::gemm( InputArray matA, InputArray matB, double alpha,`