diff --git a/modules/calib/src/precomp.hpp b/modules/calib/src/precomp.hpp index 1fabdfa193..a0249221c6 100644 --- a/modules/calib/src/precomp.hpp +++ b/modules/calib/src/precomp.hpp @@ -53,8 +53,6 @@ #include "opencv2/core/ocl.hpp" -#define GET_OPTIMIZED(func) (func) - namespace cv { diff --git a/modules/core/src/count_non_zero.simd.hpp b/modules/core/src/count_non_zero.simd.hpp index 56ad79475e..9a4ebaa0d3 100644 --- a/modules/core/src/count_non_zero.simd.hpp +++ b/modules/core/src/count_non_zero.simd.hpp @@ -224,19 +224,19 @@ CountNonZeroFunc getCountNonZeroTab(int depth) { static CountNonZeroFunc countNonZeroTab[CV_DEPTH_MAX] = { - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32s), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32f), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero64f), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16f), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16f), // for bf16 it's the same code as for f16 - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero64s), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero64s), - (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32s), + countNonZero8u, + countNonZero8u, + countNonZero16u, + countNonZero16u, + countNonZero32s, + countNonZero32f, + countNonZero64f, + countNonZero16f, + countNonZero16f, // for bf16 it's the same code as for f16 + countNonZero8u, + countNonZero64s, + countNonZero64s, + countNonZero32s, 0 }; diff --git a/modules/core/src/nan_mask.simd.hpp b/modules/core/src/nan_mask.simd.hpp index 20bba283e4..a6e6ed029a 100644 --- a/modules/core/src/nan_mask.simd.hpp +++ b/modules/core/src/nan_mask.simd.hpp @@ -107,8 +107,8 @@ static void patchNaNs_64f(uchar* ptr, size_t ulen, double newVal) PatchNanFunc getPatchNanFunc(bool isDouble) { - return isDouble ? (PatchNanFunc)GET_OPTIMIZED(patchNaNs_64f) - : (PatchNanFunc)GET_OPTIMIZED(patchNaNs_32f); + return isDouble ? patchNaNs_64f + : patchNaNs_32f; } ////// finiteMask ////// @@ -421,14 +421,14 @@ FiniteMaskFunc getFiniteMaskFunc(bool isDouble, int cn) { static FiniteMaskFunc tab[CV_DEPTH_MAX] = { - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), - (FiniteMaskFunc)GET_OPTIMIZED((finiteMask_)), + finiteMask_, + finiteMask_, + finiteMask_, + finiteMask_, + finiteMask_, + finiteMask_, + finiteMask_, + finiteMask_, }; int idx = (isDouble ? 4 : 0) + cn - 1; diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index c4adaacdbc..a0342cdb23 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -94,7 +94,6 @@ #include "opencv2/core/vsx_utils.hpp" #include "hal_replacement.hpp" -#define GET_OPTIMIZED(func) (func) namespace cv { diff --git a/modules/geometry/src/precomp.hpp b/modules/geometry/src/precomp.hpp index 1242cd0efd..e76d040b70 100644 --- a/modules/geometry/src/precomp.hpp +++ b/modules/geometry/src/precomp.hpp @@ -82,8 +82,6 @@ #include #include -#define GET_OPTIMIZED(func) (func) - namespace cv { diff --git a/modules/imgproc/src/precomp.hpp b/modules/imgproc/src/precomp.hpp index 5e9fa02f8f..f1dad10882 100644 --- a/modules/imgproc/src/precomp.hpp +++ b/modules/imgproc/src/precomp.hpp @@ -65,7 +65,6 @@ #include #include -#define GET_OPTIMIZED(func) (func) /* helper tables */ extern const uchar icvSaturate8u_cv[]; diff --git a/modules/stereo/src/precomp.hpp b/modules/stereo/src/precomp.hpp index deff149de6..b4e5db8ea1 100644 --- a/modules/stereo/src/precomp.hpp +++ b/modules/stereo/src/precomp.hpp @@ -51,8 +51,6 @@ #include "opencv2/core/ocl.hpp" -#define GET_OPTIMIZED(func) (func) - namespace cv {