Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
badc3bd3
Commit
badc3bd3
authored
Dec 19, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10348 from ElenaGvozdeva:Canny_HAL
parents
b1ed8bc0
b0e9d76c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
canny.cpp
modules/imgproc/src/canny.cpp
+5
-1
hal_replacement.hpp
modules/imgproc/src/hal_replacement.hpp
+16
-0
No files found.
modules/imgproc/src/canny.cpp
View file @
badc3bd3
...
...
@@ -956,7 +956,11 @@ void Canny( InputArray _src, OutputArray _dst,
CV_OCL_RUN
(
_dst
.
isUMat
()
&&
(
_src
.
channels
()
==
1
||
_src
.
channels
()
==
3
),
ocl_Canny
<
false
>
(
_src
,
UMat
(),
UMat
(),
_dst
,
(
float
)
low_thresh
,
(
float
)
high_thresh
,
aperture_size
,
L2gradient
,
_src
.
channels
(),
size
))
Mat
src
=
_src
.
getMat
(),
dst
=
_dst
.
getMat
();
Mat
src0
=
_src
.
getMat
(),
dst
=
_dst
.
getMat
();
Mat
src
(
src0
.
size
(),
src0
.
type
(),
src0
.
data
,
src0
.
step
);
CALL_HAL
(
canny
,
cv_hal_canny
,
src
.
data
,
src
.
step
,
dst
.
data
,
dst
.
step
,
src
.
cols
,
src
.
rows
,
src
.
channels
(),
low_thresh
,
high_thresh
,
aperture_size
,
L2gradient
);
CV_OVX_RUN
(
false
&&
/* disabling due to accuracy issues */
...
...
modules/imgproc/src/hal_replacement.hpp
View file @
badc3bd3
...
...
@@ -756,6 +756,22 @@ inline int hal_ni_pyrdown(const uchar* src_data, size_t src_step, int src_width,
#define cv_hal_pyrdown hal_ni_pyrdown
//! @endcond
/**
@brief Canny edge detector
@param src_data,src_step Source image
@param dst_data,dst_step Destination image
@param width,height Source image dimensions
@param cn Number of channels
@param lowThreshold, highThreshold Thresholds value
@param ksize Kernel size for Sobel operator.
@param L2gradient Flag, indicating use L2 or L1 norma.
*/
inline
int
hal_ni_canny
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
cn
,
double
lowThreshold
,
double
highThreshold
,
int
ksize
,
bool
L2gradient
)
{
return
CV_HAL_ERROR_NOT_IMPLEMENTED
;
}
//! @cond IGNORED
#define cv_hal_canny hal_ni_canny
//! @endcond
//! @}
#if defined __GNUC__
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment