mirrors/opencv
2
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-25 04:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30048 from vrabaud:function_ptr

Browse Source 
Remove now unused GET_OPTIMIZED
This commit is contained in:
Alexander Smorkalov
2026-09-23 15:39:53 +03:00
committed by GitHub
parent c5bb11610f ff3c9195f7
commit 1f2e52853b
7 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib/src/precomp.hpp
-2
View File
@@ -53,8 +53,6 @@
#include "opencv2/core/ocl.hpp" #include "opencv2/core/ocl.hpp"
#define GET_OPTIMIZED(func) (func)
namespace cv { namespace cv {
modules/core/src/count_non_zero.simd.hpp
+13 -13
View File
@@ -224,19 +224,19 @@ CountNonZeroFunc getCountNonZeroTab(int depth)
{ {
static CountNonZeroFunc countNonZeroTab[CV_DEPTH_MAX] = static CountNonZeroFunc countNonZeroTab[CV_DEPTH_MAX] =
{ {
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), countNonZero8u,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), countNonZero8u,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u), countNonZero16u,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u), countNonZero16u,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero32s), countNonZero32s,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero32f), countNonZero32f,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero64f), countNonZero64f,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero16f), countNonZero16f,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero16f), // for bf16 it's the same code as for f16 countNonZero16f, // for bf16 it's the same code as for f16
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), countNonZero8u,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero64s), countNonZero64s,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero64s), countNonZero64s,
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero32s), countNonZero32s,
0 0
}; };
modules/core/src/nan_mask.simd.hpp
+10 -10
View File
@@ -107,8 +107,8 @@ static void patchNaNs_64f(uchar* ptr, size_t ulen, double newVal)
PatchNanFunc getPatchNanFunc(bool isDouble) PatchNanFunc getPatchNanFunc(bool isDouble)
{ {
return isDouble ? (PatchNanFunc)GET_OPTIMIZED(patchNaNs_64f) return isDouble ? patchNaNs_64f
: (PatchNanFunc)GET_OPTIMIZED(patchNaNs_32f); : patchNaNs_32f;
} }
////// finiteMask ////// ////// finiteMask //////
@@ -421,14 +421,14 @@ FiniteMaskFunc getFiniteMaskFunc(bool isDouble, int cn)
{ {
static FiniteMaskFunc tab[CV_DEPTH_MAX] = static FiniteMaskFunc tab[CV_DEPTH_MAX] =
{ {
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<float, 1>)), finiteMask_<float, 1>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<float, 2>)), finiteMask_<float, 2>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<float, 3>)), finiteMask_<float, 3>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<float, 4>)), finiteMask_<float, 4>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<double, 1>)), finiteMask_<double, 1>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<double, 2>)), finiteMask_<double, 2>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<double, 3>)), finiteMask_<double, 3>,
(FiniteMaskFunc)GET_OPTIMIZED((finiteMask_<double, 4>)), finiteMask_<double, 4>,
}; };
int idx = (isDouble ? 4 : 0) + cn - 1; int idx = (isDouble ? 4 : 0) + cn - 1;
modules/core/src/precomp.hpp
-1
View File
@@ -94,7 +94,6 @@
#include "opencv2/core/vsx_utils.hpp" #include "opencv2/core/vsx_utils.hpp"
#include "hal_replacement.hpp" #include "hal_replacement.hpp"
#define GET_OPTIMIZED(func) (func)
namespace cv namespace cv
{ {
modules/geometry/src/precomp.hpp
-2
View File
@@ -82,8 +82,6 @@
#include <unordered_map> #include <unordered_map>
#include <cmath> #include <cmath>
#define GET_OPTIMIZED(func) (func)
namespace cv { namespace cv {
modules/imgproc/src/precomp.hpp
-1
View File
@@ -65,7 +65,6 @@
#include <stack> #include <stack>
#include <numeric> #include <numeric>
#define GET_OPTIMIZED(func) (func)
/* helper tables */ /* helper tables */
extern const uchar icvSaturate8u_cv[]; extern const uchar icvSaturate8u_cv[];
modules/stereo/src/precomp.hpp
-2
View File
@@ -51,8 +51,6 @@
#include "opencv2/core/ocl.hpp" #include "opencv2/core/ocl.hpp"
#define GET_OPTIMIZED(func) (func)
namespace cv namespace cv
{ {