Skip to content

Commit b46364e

Browse files
vpisarevvpisarev
committed
Merge pull request opencv#7996 from mshabunin:hal-filter-revert
2 parents e0ee2f7 + c4c1c4c commit b46364e

File tree

3 files changed

+620
-649
lines changed

3 files changed

+620
-649
lines changed

‎modules/imgproc/include/opencv2/imgproc/hal/hal.hpp

Lines changed: 72 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,93 @@ namespace cv { namespace hal {
1010
//! @addtogroup imgproc_hal_functions
1111
//! @{
1212

13+
//---------------------------
14+
//! @cond IGNORED
15+
1316
struct CV_EXPORTS Filter2D
1417
{
15-
static Ptr<hal::Filter2D> create(uchar * kernel_data, size_t kernel_step, int kernel_type,
16-
int kernel_width, int kernel_height,
17-
int max_width, int max_height,
18-
int stype, int dtype,
19-
int borderType, double delta,
20-
int anchor_x, int anchor_y,
21-
bool isSubmatrix, bool isInplace);
22-
virtual void apply(uchar * src_data, size_t src_step,
23-
uchar * dst_data, size_t dst_step,
24-
int width, int height,
25-
int full_width, int full_height,
26-
int offset_x, int offset_y) = 0;
18+
CV_DEPRECATED static Ptr<hal::Filter2D> create(uchar * , size_t , int ,
19+
int , int ,
20+
int , int ,
21+
int , int ,
22+
int , double ,
23+
int , int ,
24+
bool , bool );
25+
virtual void apply(uchar * , size_t ,
26+
uchar * , size_t ,
27+
int , int ,
28+
int , int ,
29+
int , int ) = 0;
2730
virtual ~Filter2D() {}
2831
};
2932

3033
struct CV_EXPORTS SepFilter2D
3134
{
32-
static Ptr<hal::SepFilter2D> create(int stype, int dtype, int ktype,
33-
uchar * kernelx_data, int kernelx_len,
34-
uchar * kernely_data, int kernely_len,
35-
int anchor_x, int anchor_y,
36-
double delta, int borderType);
37-
virtual void apply(uchar * src_data, size_t src_step,
38-
uchar * dst_data, size_t dst_step,
39-
int width, int height,
40-
int full_width, int full_height,
41-
int offset_x, int offset_y) = 0;
35+
CV_DEPRECATED static Ptr<hal::SepFilter2D> create(int , int , int ,
36+
uchar * , int ,
37+
uchar * , int ,
38+
int , int ,
39+
double , int );
40+
virtual void apply(uchar * , size_t ,
41+
uchar * , size_t ,
42+
int , int ,
43+
int , int ,
44+
int , int ) = 0;
4245
virtual ~SepFilter2D() {}
4346
};
4447

4548

46-
struct CV_EXPORTS Morph
49+
struct CV_EXPORTS Morph
4750
{
48-
static Ptr<Morph> create(int op, int src_type, int dst_type, int max_width, int max_height,
49-
int kernel_type, uchar * kernel_data, size_t kernel_step,
50-
int kernel_width, int kernel_height,
51-
int anchor_x, int anchor_y,
52-
int borderType, const double borderValue[4],
53-
int iterations, bool isSubmatrix, bool allowInplace);
54-
virtual void apply(uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, int width, int height,
55-
int roi_width, int roi_height, int roi_x, int roi_y,
56-
int roi_width2, int roi_height2, int roi_x2, int roi_y2) = 0;
51+
CV_DEPRECATED static Ptr<hal::Morph> create(int , int , int , int , int ,
52+
int , uchar * , size_t ,
53+
int , int ,
54+
int , int ,
55+
int , const double *,
56+
int , bool , bool );
57+
virtual void apply(uchar * , size_t , uchar * , size_t , int , int ,
58+
int , int , int , int ,
59+
int , int , int , int ) = 0;
5760
virtual ~Morph() {}
5861
};
5962

63+
//! @endcond
64+
//---------------------------
65+
66+
CV_EXPORTS void filter2D(int stype, int dtype, int kernel_type,
67+
uchar * src_data, size_t src_step,
68+
uchar * dst_data, size_t dst_step,
69+
int width, int height,
70+
int full_width, int full_height,
71+
int offset_x, int offset_y,
72+
uchar * kernel_data, size_t kernel_step,
73+
int kernel_width, int kernel_height,
74+
int anchor_x, int anchor_y,
75+
double delta, int borderType,
76+
bool isSubmatrix);
77+
78+
CV_EXPORTS void sepFilter2D(int stype, int dtype, int ktype,
79+
uchar * src_data, size_t src_step,
80+
uchar * dst_data, size_t dst_step,
81+
int width, int height,
82+
int full_width, int full_height,
83+
int offset_x, int offset_y,
84+
uchar * kernelx_data, int kernelx_len,
85+
uchar * kernely_data, int kernely_len,
86+
int anchor_x, int anchor_y,
87+
double delta, int borderType);
88+
89+
CV_EXPORTS void morph(int op, int src_type, int dst_type,
90+
uchar * src_data, size_t src_step,
91+
uchar * dst_data, size_t dst_step,
92+
int width, int height,
93+
int roi_width, int roi_height, int roi_x, int roi_y,
94+
int roi_width2, int roi_height2, int roi_x2, int roi_y2,
95+
int kernel_type, uchar * kernel_data, size_t kernel_step,
96+
int kernel_width, int kernel_height, int anchor_x, int anchor_y,
97+
int borderType, const double borderValue[4],
98+
int iterations, bool isSubmatrix);
99+
60100

61101
CV_EXPORTS void resize(int src_type,
62102
const uchar * src_data, size_t src_step, int src_width, int src_height,

0 commit comments

Comments
 (0)