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
f6a8ac2f
Commit
f6a8ac2f
authored
May 06, 2014
by
Alexander Karsakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed check condition in tests in case ipp disabled.
parent
dc91be86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
perf_houghLines.cpp
modules/imgproc/perf/perf_houghLines.cpp
+8
-4
test_houghLines.cpp
modules/imgproc/test/test_houghLines.cpp
+4
-0
No files found.
modules/imgproc/perf/perf_houghLines.cpp
View file @
f6a8ac2f
...
@@ -15,8 +15,8 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
...
@@ -15,8 +15,8 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
testing
::
Combine
(
testing
::
Combine
(
testing
::
Values
(
"cv/shared/pic5.png"
,
"stitching/a1.png"
),
testing
::
Values
(
"cv/shared/pic5.png"
,
"stitching/a1.png"
),
testing
::
Values
(
1
,
10
),
testing
::
Values
(
1
,
10
),
testing
::
Values
(
0.0
5
,
0.1
),
testing
::
Values
(
0.0
1
,
0.1
),
testing
::
Values
(
80
,
15
0
)
testing
::
Values
(
300
,
50
0
)
)
)
)
)
{
{
...
@@ -29,13 +29,17 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
...
@@ -29,13 +29,17 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
if
(
image
.
empty
())
if
(
image
.
empty
())
FAIL
()
<<
"Unable to load source image"
<<
filename
;
FAIL
()
<<
"Unable to load source image"
<<
filename
;
Canny
(
image
,
image
,
100
,
150
,
3
);
Canny
(
image
,
image
,
0
,
0
);
Mat
lines
;
Mat
lines
;
declare
.
time
(
60
);
declare
.
time
(
60
);
TEST_CYCLE
()
HoughLines
(
image
,
lines
,
rhoStep
,
thetaStep
,
threshold
);
TEST_CYCLE
()
HoughLines
(
image
,
lines
,
rhoStep
,
thetaStep
,
threshold
);
EXPECT_FALSE
(
lines
.
empty
());
transpose
(
lines
,
lines
);
#if (0 && defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801)
SANITY_CHECK_NOTHING
();
SANITY_CHECK_NOTHING
();
#else
SANITY_CHECK
(
lines
);
#endif
}
}
modules/imgproc/test/test_houghLines.cpp
View file @
f6a8ac2f
...
@@ -189,7 +189,11 @@ void BaseHoughLineTest::run_test(int type)
...
@@ -189,7 +189,11 @@ void BaseHoughLineTest::run_test(int type)
else
if
(
type
==
PROBABILISTIC
)
else
if
(
type
==
PROBABILISTIC
)
count
=
countMatIntersection
<
Vec4i
>
(
exp_lines
,
lines
,
1e-4
f
,
0.
f
);
count
=
countMatIntersection
<
Vec4i
>
(
exp_lines
,
lines
,
1e-4
f
,
0.
f
);
#if (0 && defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801)
EXPECT_GE
(
count
,
(
int
)
(
exp_lines
.
total
()
*
0.8
)
);
EXPECT_GE
(
count
,
(
int
)
(
exp_lines
.
total
()
*
0.8
)
);
#else
EXPECT_EQ
(
count
,
(
int
)
exp_lines
.
total
());
#endif
}
}
TEST_P
(
StandartHoughLinesTest
,
regression
)
TEST_P
(
StandartHoughLinesTest
,
regression
)
...
...
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