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
10d60f99
Commit
10d60f99
authored
Oct 03, 2013
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed ocl::integral and enabled perf test for it
parent
8224f984
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
3 deletions
+14
-3
perf_imgproc.cpp
modules/ocl/perf/perf_imgproc.cpp
+1
-1
haar.cpp
modules/ocl/src/haar.cpp
+0
-1
imgproc.cpp
modules/ocl/src/imgproc.cpp
+0
-0
test_imgproc.cpp
modules/ocl/test/test_imgproc.cpp
+13
-1
No files found.
modules/ocl/perf/perf_imgproc.cpp
View file @
10d60f99
...
...
@@ -198,7 +198,7 @@ PERF_TEST_P(cornerHarrisFixture, cornerHarris,
typedef
TestBaseWithParam
<
Size
>
integralFixture
;
PERF_TEST_P
(
integralFixture
,
DISABLED_integral
,
OCL_TYPICAL_MAT_SIZES
)
// TODO does not work properly
PERF_TEST_P
(
integralFixture
,
integral
,
OCL_TYPICAL_MAT_SIZES
)
{
const
Size
srcSize
=
GetParam
();
...
...
modules/ocl/src/haar.cpp
View file @
10d60f99
...
...
@@ -1141,7 +1141,6 @@ void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std
CvSize
sz
;
cv
::
Rect
roi
,
roi2
;
cv
::
Mat
imgroi
,
imgroisq
;
cv
::
ocl
::
oclMat
resizeroi
,
gimgroi
,
gimgroisq
;
for
(
int
i
=
0
;
i
<
m_loopcount
;
i
++
)
...
...
modules/ocl/src/imgproc.cpp
View file @
10d60f99
This diff is collapsed.
Click to expand it.
modules/ocl/test/test_imgproc.cpp
View file @
10d60f99
...
...
@@ -579,7 +579,19 @@ TEST_P(cornerHarris, Mat)
struct
integral
:
ImgprocTestBase
{};
TEST_P
(
integral
,
Mat
)
TEST_P
(
integral
,
Mat1
)
{
for
(
int
j
=
0
;
j
<
LOOP_TIMES
;
j
++
)
{
random_roi
();
cv
::
ocl
::
integral
(
clmat1_roi
,
cldst_roi
);
cv
::
integral
(
mat1_roi
,
dst_roi
);
Near
(
0
);
}
}
TEST_P
(
integral
,
Mat2
)
{
for
(
int
j
=
0
;
j
<
LOOP_TIMES
;
j
++
)
{
...
...
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