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
462c3c25
Commit
462c3c25
authored
Nov 06, 2014
by
Alexander Karsakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed incorrect using of rootn() and powr() in ocl_pow
parent
5044e0f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
mathfuncs.cpp
modules/core/src/mathfuncs.cpp
+2
-2
arithm.cl
modules/core/src/opencl/arithm.cl
+0
-10
No files found.
modules/core/src/mathfuncs.cpp
View file @
462c3c25
...
...
@@ -2478,8 +2478,8 @@ static bool ocl_pow(InputArray _src, double power, OutputArray _dst,
if
(
depth
==
CV_64F
&&
!
doubleSupport
)
return
false
;
bool
issqrt
=
std
::
abs
(
power
-
0.5
)
<
DBL_EPSILON
,
nonnegative
=
power
>=
0
;
const
char
*
const
op
=
issqrt
?
"OP_SQRT"
:
is_ipower
?
nonnegative
?
"OP_POWN"
:
"OP_ROOTN"
:
nonnegative
?
"OP_POWR
"
:
"OP_POW"
;
bool
issqrt
=
std
::
abs
(
power
-
0.5
)
<
DBL_EPSILON
;
const
char
*
const
op
=
issqrt
?
"OP_SQRT"
:
is_ipower
?
"OP_POWN
"
:
"OP_POW"
;
ocl
::
Kernel
k
(
"KF"
,
ocl
::
core
::
arithm_oclsrc
,
format
(
"-D dstT=%s -D depth=%d -D rowsPerWI=%d -D %s -D UNARY_OP%s"
,
...
...
modules/core/src/opencl/arithm.cl
View file @
462c3c25
...
...
@@ -277,16 +277,6 @@
#elif defined OP_POW
#define PROCESS_ELEM storedst(pow(srcelem1, srcelem2))
#elif defined OP_ROOTN
#define PROCESS_ELEM storedst(rootn(srcelem1, srcelem2))
#elif defined OP_POWR
#if depth == 5
#define PROCESS_ELEM storedst(native_powr(srcelem1, srcelem2))
#else
#define PROCESS_ELEM storedst(powr(srcelem1, srcelem2))
#endif
#elif defined OP_POWN
#undef workT
#define workT int
...
...
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