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
da806cc3
Commit
da806cc3
authored
Aug 12, 2014
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
parents
f937f4d9
6fb282aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
minmaxloc.cl
modules/core/src/opencl/minmaxloc.cl
+1
-1
stat.cpp
modules/core/src/stat.cpp
+1
-1
No files found.
modules/core/src/opencl/minmaxloc.cl
View file @
da806cc3
...
...
@@ -185,7 +185,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#
endif
{
#
ifdef
HAVE_SRC_CONT
src_index
=
mul24
(
id,
srcTSIZE
)
;
src_index
=
id
*
srcTSIZE
;//
mul24(id, srcTSIZE);
#
else
src_index
=
mad24
(
id
/
cols,
src_step,
mul24
(
id
%
cols,
srcTSIZE
))
;
#
endif
...
...
modules/core/src/stat.cpp
View file @
da806cc3
...
...
@@ -1454,7 +1454,7 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*
CV_Assert
(
!
haveSrc2
||
_src2
.
type
()
==
type
);
if
(
depth
==
CV_32S
||
depth
==
CV_32F
)
if
(
depth
==
CV_32S
)
return
false
;
if
((
depth
==
CV_64F
||
ddepth
==
CV_64F
)
&&
!
doubleSupport
)
...
...
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