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
5a938309
Commit
5a938309
authored
9 years ago
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More compilation warnings fixed
parent
11378fcb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
dxt.cpp
modules/core/src/dxt.cpp
+9
-9
No files found.
modules/core/src/dxt.cpp
View file @
5a938309
...
...
@@ -3787,7 +3787,7 @@ typedef IppStatus (CV_STDCALL * ippiDCTGetBufSize)(const void*, int*);
class
DctIPPLoop_Invoker
:
public
ParallelLoopBody
{
public
:
DctIPPLoop_Invoker
(
const
uchar
*
_src
,
int
_src_step
,
uchar
*
_dst
,
in
t
_dst_step
,
int
_width
,
bool
_inv
,
bool
*
_ok
)
:
DctIPPLoop_Invoker
(
const
uchar
*
_src
,
size_t
_src_step
,
uchar
*
_dst
,
size_
t
_dst_step
,
int
_width
,
bool
_inv
,
bool
*
_ok
)
:
ParallelLoopBody
(),
src
(
_src
),
src_step
(
_src_step
),
dst
(
_dst
),
dst_step
(
_dst_step
),
width
(
_width
),
inv
(
_inv
),
ok
(
_ok
)
{
*
ok
=
true
;
...
...
@@ -3856,7 +3856,7 @@ public:
for
(
int
i
=
range
.
start
;
i
<
range
.
end
;
++
i
)
{
if
(
ippDctFun
((
float
*
)(
src
+
src_step
*
i
),
s
rc_step
,
(
float
*
)(
dst
+
dst_step
*
i
),
dst_step
,
pDCTSpec
,
pBuffer
)
<
0
)
if
(
ippDctFun
((
float
*
)(
src
+
src_step
*
i
),
s
tatic_cast
<
int
>
(
src_step
),
(
float
*
)(
dst
+
dst_step
*
i
),
static_cast
<
int
>
(
dst_step
)
,
pDCTSpec
,
pBuffer
)
<
0
)
{
*
ok
=
false
;
IPP_RETURN
...
...
@@ -3886,7 +3886,7 @@ public:
for
(
int
i
=
range
.
start
;
i
<
range
.
end
;
++
i
)
{
if
(
ippDctFun
((
float
*
)(
src
+
src_step
*
i
),
s
rc_step
,
(
float
*
)(
dst
+
dst_step
*
i
),
dst_step
,
pDCTSpec
,
(
Ipp8u
*
)
pBuffer
)
<
0
)
if
(
ippDctFun
((
float
*
)(
src
+
src_step
*
i
),
s
tatic_cast
<
int
>
(
src_step
),
(
float
*
)(
dst
+
dst_step
*
i
),
static_cast
<
int
>
(
dst_step
)
,
pDCTSpec
,
(
Ipp8u
*
)
pBuffer
)
<
0
)
{
*
ok
=
false
;
break
;
...
...
@@ -3908,22 +3908,22 @@ public:
private
:
const
uchar
*
src
;
in
t
src_step
;
size_
t
src_step
;
uchar
*
dst
;
in
t
dst_step
;
size_
t
dst_step
;
int
width
;
bool
inv
;
bool
*
ok
;
};
static
bool
DctIPPLoop
(
const
uchar
*
src
,
int
src_step
,
uchar
*
dst
,
in
t
dst_step
,
int
width
,
int
height
,
bool
inv
)
static
bool
DctIPPLoop
(
const
uchar
*
src
,
size_t
src_step
,
uchar
*
dst
,
size_
t
dst_step
,
int
width
,
int
height
,
bool
inv
)
{
bool
ok
;
parallel_for_
(
Range
(
0
,
height
),
DctIPPLoop_Invoker
(
src
,
src_step
,
dst
,
dst_step
,
width
,
inv
,
&
ok
),
height
/
(
double
)(
1
<<
4
)
);
return
ok
;
}
static
bool
ippi_DCT_32f
(
const
uchar
*
src
,
int
src_step
,
uchar
*
dst
,
in
t
dst_step
,
int
width
,
int
height
,
bool
inv
,
bool
row
)
static
bool
ippi_DCT_32f
(
const
uchar
*
src
,
size_t
src_step
,
uchar
*
dst
,
size_
t
dst_step
,
int
width
,
int
height
,
bool
inv
,
bool
row
)
{
if
(
row
)
return
DctIPPLoop
(
src
,
src_step
,
dst
,
dst_step
,
width
,
height
,
inv
);
...
...
@@ -3978,7 +3978,7 @@ static bool ippi_DCT_32f(const uchar * src, int src_step, uchar * dst, int dst_s
return
false
;
}
if
(
ippDctFun
((
float
*
)
src
,
s
rc_step
,
(
float
*
)
dst
,
dst_step
,
pDCTSpec
,
pBuffer
)
<
0
)
if
(
ippDctFun
((
float
*
)
src
,
s
tatic_cast
<
int
>
(
src_step
),
(
float
*
)
dst
,
static_cast
<
int
>
(
dst_step
)
,
pDCTSpec
,
pBuffer
)
<
0
)
{
IPP_RELEASE
return
false
;
...
...
@@ -4010,7 +4010,7 @@ static bool ippi_DCT_32f(const uchar * src, int src_step, uchar * dst, int dst_s
buf
.
allocate
(
bufSize
);
pBuffer
=
(
uchar
*
)
buf
;
status
=
ippDctFun
((
float
*
)
src
,
s
rc_step
,
(
float
*
)
dst
,
dst_step
,
pDCTSpec
,
(
Ipp8u
*
)
pBuffer
);
status
=
ippDctFun
((
float
*
)
src
,
s
tatic_cast
<
int
>
(
src_step
),
(
float
*
)
dst
,
static_cast
<
int
>
(
dst_step
)
,
pDCTSpec
,
(
Ipp8u
*
)
pBuffer
);
}
if
(
pDCTSpec
)
...
...
This diff is collapsed.
Click to expand it.
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