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
884b706b
Commit
884b706b
authored
Apr 14, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warning
parent
ad7f2311
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
7 deletions
+11
-7
stat.cpp
modules/core/src/stat.cpp
+1
-1
perf_filters.cpp
modules/imgproc/perf/opencl/perf_filters.cpp
+1
-1
deriv.cpp
modules/imgproc/src/deriv.cpp
+2
-0
filter.cpp
modules/imgproc/src/filter.cpp
+4
-4
histogram.cpp
modules/imgproc/src/histogram.cpp
+1
-1
moments.cpp
modules/imgproc/src/moments.cpp
+2
-0
No files found.
modules/core/src/stat.cpp
View file @
884b706b
...
...
@@ -696,7 +696,7 @@ int cv::countNonZero( InputArray _src )
if
(
src
.
dims
<=
2
||
src
.
isContinuous
())
{
IppiSize
roiSize
=
{
src
.
cols
,
src
.
rows
};
Ipp32s
count
,
srcstep
=
(
Ipp32s
)
src
.
step
;
Ipp32s
count
=
0
,
srcstep
=
(
Ipp32s
)
src
.
step
;
IppStatus
status
=
(
IppStatus
)
-
1
;
if
(
src
.
isContinuous
())
...
...
modules/imgproc/perf/opencl/perf_filters.cpp
View file @
884b706b
...
...
@@ -112,7 +112,7 @@ OCL_PERF_TEST_P(LaplacianFixture, Laplacian,
const
FilterParams
params
=
GetParam
();
const
Size
srcSize
=
get
<
0
>
(
params
);
const
int
type
=
get
<
1
>
(
params
),
ksize
=
get
<
2
>
(
params
);
const
double
eps
=
CV_MAT_DEPTH
(
type
)
<=
CV_32S
?
1
:
1
e-5
;
const
double
eps
=
CV_MAT_DEPTH
(
type
)
<=
CV_32S
?
1
:
2
e-5
;
checkDeviceMaxMemoryAllocSize
(
srcSize
,
type
);
...
...
modules/imgproc/src/deriv.cpp
View file @
884b706b
...
...
@@ -607,6 +607,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
} \
} while ((void)0, 0)
CV_SUPPRESS_DEPRECATED_START
if
(
sdepth
==
CV_8U
&&
ddepth
==
CV_16S
&&
!
floatScale
&&
!
floatDelta
)
{
IPP_FILTER_LAPLACIAN
(
Ipp8u
,
Ipp16s
,
8u16
s
);
...
...
@@ -625,6 +626,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
if
(
needDelta
&&
status
>=
0
)
status
=
ippiAddC_32f_C1IR
((
Ipp32f
)
delta
,
(
Ipp32f
*
)
dst
.
data
,
(
int
)
dst
.
step
,
roisize
);
}
CV_SUPPRESS_DEPRECATED_END
if
(
status
>=
0
)
return
;
...
...
modules/imgproc/src/filter.cpp
View file @
884b706b
...
...
@@ -1413,14 +1413,14 @@ struct RowVec_32f
{
kernel
=
_kernel
;
haveSSE
=
checkHardwareSupport
(
CV_CPU_SSE
);
#if
def USE_IPP_SEP_FILTERS
#if
defined USE_IPP_SEP_FILTERS && 0
bufsz
=
-
1
;
#endif
}
int
operator
()(
const
uchar
*
_src
,
uchar
*
_dst
,
int
width
,
int
cn
)
const
{
#if
def USE_IPP_SEP_FILTERS
#if
defined USE_IPP_SEP_FILTERS && 0
int
ret
=
ippiOperator
(
_src
,
_dst
,
width
,
cn
);
if
(
ret
>
0
)
return
ret
;
...
...
@@ -1458,13 +1458,13 @@ struct RowVec_32f
Mat
kernel
;
bool
haveSSE
;
#if
def USE_IPP_SEP_FILTERS
#if
defined USE_IPP_SEP_FILTERS && 0
private
:
mutable
int
bufsz
;
int
ippiOperator
(
const
uchar
*
_src
,
uchar
*
_dst
,
int
width
,
int
cn
)
const
{
int
_ksize
=
kernel
.
rows
+
kernel
.
cols
-
1
;
//
if ((1 != cn && 3 != cn) || width < _ksize*8)
if
((
1
!=
cn
&&
3
!=
cn
)
||
width
<
_ksize
*
8
)
return
0
;
const
float
*
src
=
(
const
float
*
)
_src
;
...
...
modules/imgproc/src/histogram.cpp
View file @
884b706b
...
...
@@ -1242,7 +1242,7 @@ void cv::calcHist( const Mat* images, int nimages, const int* channels,
bool
ok
=
true
;
const
Mat
&
src
=
images
[
0
];
int
nstripes
=
std
::
min
<
int
>
(
8
,
s
rc
.
total
()
/
(
1
<<
16
));
int
nstripes
=
std
::
min
<
int
>
(
8
,
s
tatic_cast
<
int
>
(
src
.
total
()
/
(
1
<<
16
)
));
#ifdef HAVE_CONCURRENCY
nstripes
=
1
;
#endif
...
...
modules/imgproc/src/moments.cpp
View file @
884b706b
...
...
@@ -474,6 +474,7 @@ cv::Moments cv::moments( InputArray _src, bool binary )
// ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecated in 8.1, but there are not another way
// to initialize IppiMomentState_64f. When GetStateSize and Init functions will appear we have to
// change our code.
CV_SUPPRESS_DEPRECATED_START
if
(
0
<=
ippiMomentInitAlloc_64f
(
&
moment
,
ippAlgHintAccurate
))
{
IppStatus
sts
=
(
IppStatus
)(
-
1
);
...
...
@@ -518,6 +519,7 @@ cv::Moments cv::moments( InputArray _src, bool binary )
}
ippiMomentFree_64f
(
moment
);
}
CV_SUPPRESS_DEPRECATED_END
}
#endif
...
...
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