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
19a24950
Commit
19a24950
authored
May 07, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed IPP related warnings
parent
b1a28a52
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
21 deletions
+33
-21
internal.hpp
modules/core/include/opencv2/core/internal.hpp
+7
-0
arithm.cpp
modules/core/src/arithm.cpp
+0
-0
stat.cpp
modules/core/src/stat.cpp
+4
-4
color.cpp
modules/imgproc/src/color.cpp
+2
-0
imgwarp.cpp
modules/imgproc/src/imgwarp.cpp
+9
-6
haar.cpp
modules/objdetect/src/haar.cpp
+6
-6
hog.cpp
modules/objdetect/src/hog.cpp
+5
-5
No files found.
modules/core/include/opencv2/core/internal.hpp
View file @
19a24950
...
...
@@ -97,6 +97,13 @@ CV_INLINE IppiSize ippiSize(int width, int height)
IppiSize
size
=
{
width
,
height
};
return
size
;
}
CV_INLINE
IppiSize
ippiSize
(
const
cv
::
Size
&
_size
)
{
IppiSize
size
=
{
_size
.
width
,
_size
.
height
};
return
size
;
}
#endif
#ifndef IPPI_CALL
...
...
modules/core/src/arithm.cpp
View file @
19a24950
This diff is collapsed.
Click to expand it.
modules/core/src/stat.cpp
View file @
19a24950
...
...
@@ -728,10 +728,10 @@ void cv::meanStdDev( InputArray _src, OutputArray _mean, OutputArray _sdv, Input
dcn_stddev
=
(
int
)
stddev
.
total
();
pstddev
=
(
Ipp64f
*
)
stddev
.
data
;
}
for
(
int
k
=
cn
;
k
<
dcn_mean
;
k
++
)
pmean
[
k
]
=
0
;
for
(
int
k
=
cn
;
k
<
dcn_stddev
;
k
++
)
pstddev
[
k
]
=
0
;
for
(
int
c
=
cn
;
c
<
dcn_mean
;
c
++
)
pmean
[
c
]
=
0
;
for
(
int
c
=
cn
;
c
<
dcn_stddev
;
c
++
)
pstddev
[
c
]
=
0
;
IppiSize
sz
=
{
cols
,
rows
};
int
type
=
src
.
type
();
if
(
!
mask
.
empty
()
)
...
...
modules/imgproc/src/color.cpp
View file @
19a24950
...
...
@@ -301,6 +301,7 @@ static ippiReorderFunc ippiSwapChannelsC4RTab[] =
0
,
(
ippiReorderFunc
)
ippiSwapChannels_32f_AC4R
,
0
,
0
};
#if 0
static ippiColor2GrayFunc ippiColor2GrayC3Tab[] =
{
(ippiColor2GrayFunc)ippiColorToGray_8u_C3C1R, 0, (ippiColor2GrayFunc)ippiColorToGray_16u_C3C1R, 0,
...
...
@@ -312,6 +313,7 @@ static ippiColor2GrayFunc ippiColor2GrayC4Tab[] =
(ippiColor2GrayFunc)ippiColorToGray_8u_AC4C1R, 0, (ippiColor2GrayFunc)ippiColorToGray_16u_AC4C1R, 0,
0, (ippiColor2GrayFunc)ippiColorToGray_32f_AC4C1R, 0, 0
};
#endif
static
ippiGeneralFunc
ippiRGB2GrayC3Tab
[]
=
{
...
...
modules/imgproc/src/imgwarp.cpp
View file @
19a24950
...
...
@@ -72,7 +72,7 @@ namespace cv
return
func
(
values
,
dataPointer
,
step
,
size
)
>=
0
;
}
bool
IPPSet
(
const
cv
::
Scalar
&
value
,
void
*
dataPointer
,
int
step
,
IppiSize
&
size
,
int
channels
,
int
depth
)
static
bool
IPPSet
(
const
cv
::
Scalar
&
value
,
void
*
dataPointer
,
int
step
,
IppiSize
&
size
,
int
channels
,
int
depth
)
{
if
(
channels
==
1
)
{
...
...
@@ -3404,8 +3404,10 @@ class IPPwarpAffineInvoker :
public
ParallelLoopBody
{
public
:
IPPwarpAffineInvoker
(
Mat
&
_src
,
Mat
&
_dst
,
double
(
&
_coeffs
)[
2
][
3
],
int
&
_interpolation
,
int
&
_borderType
,
const
Scalar
&
_borderValue
,
ippiWarpAffineBackFunc
_func
,
bool
*
_ok
)
:
ParallelLoopBody
(),
src
(
_src
),
dst
(
_dst
),
mode
(
_interpolation
),
coeffs
(
_coeffs
),
borderType
(
_borderType
),
borderValue
(
_borderValue
),
func
(
_func
),
ok
(
_ok
)
IPPwarpAffineInvoker
(
Mat
&
_src
,
Mat
&
_dst
,
double
(
&
_coeffs
)[
2
][
3
],
int
&
_interpolation
,
int
&
_borderType
,
const
Scalar
&
_borderValue
,
ippiWarpAffineBackFunc
_func
,
bool
*
_ok
)
:
ParallelLoopBody
(),
src
(
_src
),
dst
(
_dst
),
coeffs
(
_coeffs
),
mode
(
_interpolation
),
borderType
(
_borderType
),
borderValue
(
_borderValue
),
func
(
_func
),
ok
(
_ok
)
{
*
ok
=
true
;
}
...
...
@@ -3552,7 +3554,6 @@ class warpPerspectiveInvoker :
public
ParallelLoopBody
{
public
:
warpPerspectiveInvoker
(
const
Mat
&
_src
,
Mat
&
_dst
,
double
*
_M
,
int
_interpolation
,
int
_borderType
,
const
Scalar
&
_borderValue
)
:
ParallelLoopBody
(),
src
(
_src
),
dst
(
_dst
),
M
(
_M
),
interpolation
(
_interpolation
),
...
...
@@ -3644,8 +3645,10 @@ class IPPwarpPerspectiveInvoker :
public
ParallelLoopBody
{
public
:
IPPwarpPerspectiveInvoker
(
Mat
&
_src
,
Mat
&
_dst
,
double
(
&
_coeffs
)[
3
][
3
],
int
&
_interpolation
,
int
&
_borderType
,
const
Scalar
&
_borderValue
,
ippiWarpPerspectiveBackFunc
_func
,
bool
*
_ok
)
:
ParallelLoopBody
(),
src
(
_src
),
dst
(
_dst
),
mode
(
_interpolation
),
coeffs
(
_coeffs
),
borderType
(
_borderType
),
borderValue
(
_borderValue
),
func
(
_func
),
ok
(
_ok
)
IPPwarpPerspectiveInvoker
(
Mat
&
_src
,
Mat
&
_dst
,
double
(
&
_coeffs
)[
3
][
3
],
int
&
_interpolation
,
int
&
_borderType
,
const
Scalar
&
_borderValue
,
ippiWarpPerspectiveBackFunc
_func
,
bool
*
_ok
)
:
ParallelLoopBody
(),
src
(
_src
),
dst
(
_dst
),
coeffs
(
_coeffs
),
mode
(
_interpolation
),
borderType
(
_borderType
),
borderValue
(
_borderValue
),
func
(
_func
),
ok
(
_ok
)
{
*
ok
=
true
;
}
...
...
modules/objdetect/src/haar.cpp
View file @
19a24950
...
...
@@ -1317,9 +1317,9 @@ public:
if
(
cascade
->
hid_cascade
->
ipp_stages
)
{
IppiRect
iequRect
=
{
equRect
.
x
,
equRect
.
y
,
equRect
.
width
,
equRect
.
height
};
ippiRectStdDev_32f_C1R
(
sum1
.
ptr
<
float
>
(
y1
),
sum1
.
step
,
sqsum1
.
ptr
<
double
>
(
y1
),
sqsum1
.
step
,
norm1
->
ptr
<
float
>
(
y1
),
norm1
->
step
,
ippiRectStdDev_32f_C1R
(
sum1
.
ptr
<
float
>
(
y1
),
(
int
)
sum1
.
step
,
sqsum1
.
ptr
<
double
>
(
y1
),
(
int
)
sqsum1
.
step
,
norm1
->
ptr
<
float
>
(
y1
),
(
int
)
norm1
->
step
,
ippiSize
(
ssz
.
width
,
ssz
.
height
),
iequRect
);
int
positive
=
(
ssz
.
width
/
ystep
)
*
((
ssz
.
height
+
ystep
-
1
)
/
ystep
);
...
...
@@ -1340,9 +1340,9 @@ public:
for
(
int
j
=
0
;
j
<
cascade
->
count
;
j
++
)
{
if
(
ippiApplyHaarClassifier_32f_C1R
(
sum1
.
ptr
<
float
>
(
y1
),
sum1
.
step
,
norm1
->
ptr
<
float
>
(
y1
),
norm1
->
step
,
mask1
->
ptr
<
uchar
>
(
y1
),
mask1
->
step
,
sum1
.
ptr
<
float
>
(
y1
),
(
int
)
sum1
.
step
,
norm1
->
ptr
<
float
>
(
y1
),
(
int
)
norm1
->
step
,
mask1
->
ptr
<
uchar
>
(
y1
),
(
int
)
mask1
->
step
,
ippiSize
(
ssz
.
width
,
ssz
.
height
),
&
positive
,
cascade
->
hid_cascade
->
stage_classifier
[
j
].
threshold
,
(
IppiHaarClassifier_32f
*
)
cascade
->
hid_cascade
->
ipp_stages
[
j
])
<
0
)
...
...
modules/objdetect/src/hog.cpp
View file @
19a24950
...
...
@@ -747,7 +747,7 @@ void HOGCache::normalizeBlockHistogram(float* _hist) const
float
sum
=
0
;
#ifdef HAVE_IPP
ippsDotProd_32f
(
hist
,
hist
,
sz
,
&
sum
);
ippsDotProd_32f
(
hist
,
hist
,
(
int
)
sz
,
&
sum
);
#else
for
(
i
=
0
;
i
<
sz
;
i
++
)
sum
+=
hist
[
i
]
*
hist
[
i
];
...
...
@@ -755,9 +755,9 @@ void HOGCache::normalizeBlockHistogram(float* _hist) const
float
scale
=
1.
f
/
(
std
::
sqrt
(
sum
)
+
sz
*
0.1
f
),
thresh
=
(
float
)
descriptor
->
L2HysThreshold
;
#ifdef HAVE_IPP
ippsMulC_32f_I
(
scale
,
hist
,
sz
);
ippsThreshold_32f_I
(
hist
,
sz
,
thresh
,
ippCmpGreater
);
ippsDotProd_32f
(
hist
,
hist
,
sz
,
&
sum
);
ippsMulC_32f_I
(
scale
,
hist
,
(
int
)
sz
);
ippsThreshold_32f_I
(
hist
,
(
int
)
sz
,
thresh
,
ippCmpGreater
);
ippsDotProd_32f
(
hist
,
hist
,
(
int
)
sz
,
&
sum
);
#else
for
(
i
=
0
,
sum
=
0
;
i
<
sz
;
i
++
)
{
...
...
@@ -768,7 +768,7 @@ void HOGCache::normalizeBlockHistogram(float* _hist) const
scale
=
1.
f
/
(
std
::
sqrt
(
sum
)
+
1e-3
f
);
#ifdef HAVE_IPP
ippsMulC_32f_I
(
scale
,
hist
,
sz
);
ippsMulC_32f_I
(
scale
,
hist
,
(
int
)
sz
);
#else
for
(
i
=
0
;
i
<
sz
;
i
++
)
hist
[
i
]
*=
scale
;
...
...
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