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
7ac5c367
Commit
7ac5c367
authored
May 12, 2014
by
Alexander Alekhin
Committed by
OpenCV Buildbot
May 12, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2715 from akarsakov:fix_corner_min_eigen
parents
eba1be71
4e7f62fd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
corner.cpp
modules/imgproc/src/corner.cpp
+3
-3
No files found.
modules/imgproc/src/corner.cpp
View file @
7ac5c367
...
...
@@ -460,7 +460,6 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in
Mat
src
=
_src
.
getMat
();
_dst
.
create
(
src
.
size
(),
CV_32FC1
);
Mat
dst
=
_dst
.
getMat
();
#if defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && (IPP_VERSION_MAJOR >= 8)
typedef
IppStatus
(
CV_STDCALL
*
ippiMinEigenValGetBufferSize
)(
IppiSize
,
int
,
int
,
int
*
);
typedef
IppStatus
(
CV_STDCALL
*
ippiMinEigenVal
)(
const
void
*
,
int
,
Ipp32f
*
,
int
,
IppiSize
,
IppiKernelType
,
int
,
int
,
Ipp8u
*
);
...
...
@@ -477,7 +476,7 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in
bool
isolated
=
(
borderType
&
BORDER_ISOLATED
)
!=
0
;
int
borderTypeNI
=
borderType
&
~
BORDER_ISOLATED
;
if
((
borderTypeNI
==
BORDER_REPLICATE
&&
(
!
src
.
isSubmatrix
()
||
isolated
))
&&
(
kerSize
==
3
||
kerSize
==
5
)
&&
(
ker
Size
==
3
||
blockSize
==
5
))
(
kerSize
==
3
||
kerSize
==
5
)
&&
(
block
Size
==
3
||
blockSize
==
5
))
{
ippiMinEigenValGetBufferSize
getBufferSizeFunc
=
0
;
ippiMinEigenVal
minEigenValFunc
=
0
;
...
...
@@ -494,12 +493,13 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in
minEigenValFunc
=
(
ippiMinEigenVal
)
ippiMinEigenVal_32f_C1R
;
norm_coef
=
255.
f
;
}
norm_coef
=
kerType
==
ippKernelSobel
?
norm_coef
:
norm_coef
/
2.45
f
;
if
(
getBufferSizeFunc
&&
minEigenValFunc
)
{
int
bufferSize
;
IppiSize
srcRoi
=
{
src
.
cols
,
src
.
rows
};
IppStatus
ok
=
getBufferSizeFunc
(
srcRoi
,
k
s
ize
,
blockSize
,
&
bufferSize
);
IppStatus
ok
=
getBufferSizeFunc
(
srcRoi
,
k
erS
ize
,
blockSize
,
&
bufferSize
);
if
(
ok
>=
0
)
{
AutoBuffer
<
uchar
>
buffer
(
bufferSize
);
...
...
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