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
be29d628
Commit
be29d628
authored
Apr 04, 2014
by
vbystricky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
parent
4512d064
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
morph.cpp
modules/imgproc/src/morph.cpp
+4
-4
No files found.
modules/imgproc/src/morph.cpp
View file @
be29d628
...
@@ -1136,7 +1136,7 @@ private:
...
@@ -1136,7 +1136,7 @@ private:
Scalar
borderValue
;
Scalar
borderValue
;
};
};
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >=
7
)
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >=
8) && (IPP_VERSION_MINOR >= 1
)
static
bool
IPPMorphReplicate
(
int
op
,
const
Mat
&
src
,
Mat
&
dst
,
const
Mat
&
kernel
,
static
bool
IPPMorphReplicate
(
int
op
,
const
Mat
&
src
,
Mat
&
dst
,
const
Mat
&
kernel
,
const
Size
&
ksize
,
const
Point
&
anchor
,
bool
rectKernel
)
const
Size
&
ksize
,
const
Point
&
anchor
,
bool
rectKernel
)
{
{
...
@@ -1186,16 +1186,16 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
...
@@ -1186,16 +1186,16 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
#else
#else
IppiPoint
point
=
{
anchor
.
x
,
anchor
.
y
};
IppiPoint
point
=
{
anchor
.
x
,
anchor
.
y
};
// this is case, which can be used with the anchor not in center of the kernel, but
// this is case, which can be used with the anchor not in center of the kernel, but
// ippiMorphologyBorderGetSize_, ippiErodeBorderReplicate_ and ippiDilateBorderReplicate_ are deprecate.
// ippiMorphologyBorderGetSize_, ippiErodeBorderReplicate_ and ippiDilateBorderReplicate_ are deprecate
d
.
#define IPP_MORPH_CASE(cvtype, flavor, data_type) \
#define IPP_MORPH_CASE(cvtype, flavor, data_type) \
case cvtype: \
case cvtype: \
{\
{\
int specSize = 0;\
int specSize = 0;\
int bufferSize = 0;\
int bufferSize = 0;\
if (ippStsNoErr != ippiMorphology
BorderGetSize_##flavor( roiSize.width, kernelSize, &specSize, &buffer
Size))\
if (ippStsNoErr != ippiMorphology
GetSize_##flavor( roiSize.width, kernel.data kernelSize, &spec
Size))\
return false;\
return false;\
bool ok = false;\
bool ok = false;\
IppiMorphState* pState = (IppiMorphState*)ippMalloc(specSize);
;
\
IppiMorphState* pState = (IppiMorphState*)ippMalloc(specSize);\
if (ippiMorphologyInit_##flavor(roiSize.width, kernel.data, kernelSize, point, pState) >= 0)\
if (ippiMorphologyInit_##flavor(roiSize.width, kernel.data, kernelSize, point, pState) >= 0)\
{\
{\
if (op == MORPH_ERODE)\
if (op == MORPH_ERODE)\
...
...
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