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
492ef145
Commit
492ef145
authored
Sep 11, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12494 from DEEPIR:3.4
parents
be2ccdbf
8f78a112
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
17 deletions
+4
-17
transform_detail.hpp
...ore/include/opencv2/core/cuda/detail/transform_detail.hpp
+2
-9
transform.hpp
...les/cudev/include/opencv2/cudev/grid/detail/transform.hpp
+2
-8
No files found.
modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp
View file @
492ef145
...
...
@@ -223,11 +223,7 @@ namespace cv { namespace cuda { namespace device
if
(
x_shifted
+
ft
::
smart_shift
-
1
<
src_
.
cols
)
{
const
read_type
src_n_el
=
((
const
read_type
*
)
src
)[
x
];
write_type
dst_n_el
=
((
const
write_type
*
)
dst
)[
x
];
OpUnroller
<
ft
::
smart_shift
>::
unroll
(
src_n_el
,
dst_n_el
,
mask
,
op
,
x_shifted
,
y
);
((
write_type
*
)
dst
)[
x
]
=
dst_n_el
;
OpUnroller
<
ft
::
smart_shift
>::
unroll
(
src_n_el
,
((
write_type
*
)
dst
)[
x
],
mask
,
op
,
x_shifted
,
y
);
}
else
{
...
...
@@ -275,11 +271,8 @@ namespace cv { namespace cuda { namespace device
{
const
read_type1
src1_n_el
=
((
const
read_type1
*
)
src1
)[
x
];
const
read_type2
src2_n_el
=
((
const
read_type2
*
)
src2
)[
x
];
write_type
dst_n_el
=
((
const
write_type
*
)
dst
)[
x
];
OpUnroller
<
ft
::
smart_shift
>::
unroll
(
src1_n_el
,
src2_n_el
,
dst_n_el
,
mask
,
op
,
x_shifted
,
y
);
((
write_type
*
)
dst
)[
x
]
=
dst_n_el
;
OpUnroller
<
ft
::
smart_shift
>::
unroll
(
src1_n_el
,
src2_n_el
,
((
write_type
*
)
dst
)[
x
],
mask
,
op
,
x_shifted
,
y
)
;
}
else
{
...
...
modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp
View file @
492ef145
...
...
@@ -199,11 +199,8 @@ namespace grid_transform_detail
if
(
x_shifted
+
SHIFT
-
1
<
cols
)
{
const
read_type
src_n_el
=
((
const
read_type
*
)
src
)[
x
];
write_type
dst_n_el
=
((
const
write_type
*
)
dst
)[
x
];
OpUnroller
<
SHIFT
>::
unroll
(
src_n_el
,
dst_n_el
,
op
,
mask
,
x_shifted
,
y
);
((
write_type
*
)
dst
)[
x
]
=
dst_n_el
;
OpUnroller
<
SHIFT
>::
unroll
(
src_n_el
,
((
write_type
*
)
dst
)[
x
],
op
,
mask
,
x_shifted
,
y
);
}
else
{
...
...
@@ -237,11 +234,8 @@ namespace grid_transform_detail
{
const
read_type1
src1_n_el
=
((
const
read_type1
*
)
src1
)[
x
];
const
read_type2
src2_n_el
=
((
const
read_type2
*
)
src2
)[
x
];
write_type
dst_n_el
=
((
const
write_type
*
)
dst
)[
x
];
OpUnroller
<
SHIFT
>::
unroll
(
src1_n_el
,
src2_n_el
,
dst_n_el
,
op
,
mask
,
x_shifted
,
y
);
((
write_type
*
)
dst
)[
x
]
=
dst_n_el
;
OpUnroller
<
SHIFT
>::
unroll
(
src1_n_el
,
src2_n_el
,
((
write_type
*
)
dst
)[
x
],
op
,
mask
,
x_shifted
,
y
)
;
}
else
{
...
...
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