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
1fc655a5
Commit
1fc655a5
authored
Jul 21, 2016
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6964 from tomoaki0705:fixTypoImgproc
parents
2acfb263
57d15919
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
imgwarp.cpp
modules/imgproc/src/imgwarp.cpp
+7
-7
No files found.
modules/imgproc/src/imgwarp.cpp
View file @
1fc655a5
...
...
@@ -4617,14 +4617,14 @@ static bool ocl_linearPolar(InputArray _src, OutputArray _dst,
size_t
w
=
dsize
.
width
;
size_t
h
=
dsize
.
height
;
String
buildOptions
;
unsigned
mem_s
zi
e
=
32
;
unsigned
mem_s
iz
e
=
32
;
if
(
flags
&
CV_WARP_INVERSE_MAP
)
{
buildOptions
=
"-D InverseMap"
;
}
else
{
buildOptions
=
format
(
"-D ForwardMap -D MEM_SIZE=%d"
,
mem_s
zi
e
);
buildOptions
=
format
(
"-D ForwardMap -D MEM_SIZE=%d"
,
mem_s
iz
e
);
}
String
retval
;
ocl
::
Program
p
(
ocl
::
imgproc
::
linearPolar_oclsrc
,
buildOptions
,
retval
);
...
...
@@ -4662,7 +4662,7 @@ static bool ocl_linearPolar(InputArray _src, OutputArray _dst,
}
size_t
globalThreads
[
2
]
=
{
(
size_t
)
dsize
.
width
,
(
size_t
)
dsize
.
height
};
size_t
localThreads
[
2
]
=
{
mem_s
zie
,
mem_szi
e
};
size_t
localThreads
[
2
]
=
{
mem_s
ize
,
mem_siz
e
};
k
.
run
(
2
,
globalThreads
,
localThreads
,
false
);
remap
(
src
,
_dst
,
mapx
,
mapy
,
flags
&
cv
::
INTER_MAX
,
(
flags
&
CV_WARP_FILL_OUTLIERS
)
?
cv
::
BORDER_CONSTANT
:
cv
::
BORDER_TRANSPARENT
);
return
true
;
...
...
@@ -4686,14 +4686,14 @@ static bool ocl_logPolar(InputArray _src, OutputArray _dst,
size_t
w
=
dsize
.
width
;
size_t
h
=
dsize
.
height
;
String
buildOptions
;
unsigned
mem_s
zi
e
=
32
;
unsigned
mem_s
iz
e
=
32
;
if
(
flags
&
CV_WARP_INVERSE_MAP
)
{
buildOptions
=
"-D InverseMap"
;
}
else
{
buildOptions
=
format
(
"-D ForwardMap -D MEM_SIZE=%d"
,
mem_s
zi
e
);
buildOptions
=
format
(
"-D ForwardMap -D MEM_SIZE=%d"
,
mem_s
iz
e
);
}
String
retval
;
ocl
::
Program
p
(
ocl
::
imgproc
::
logPolar_oclsrc
,
buildOptions
,
retval
);
...
...
@@ -4731,9 +4731,9 @@ static bool ocl_logPolar(InputArray _src, OutputArray _dst,
k
.
args
(
ocl_mapx
,
ocl_mapy
,
ascale
,
(
float
)
M
,
center
.
x
,
center
.
y
,
ANGLE_BORDER
,
(
unsigned
)
dsize
.
width
,
(
unsigned
)
dsize
.
height
);
}
}
size_t
globalThreads
[
2
]
=
{
(
size_t
)
dsize
.
width
,
(
size_t
)
dsize
.
height
};
size_t
localThreads
[
2
]
=
{
mem_s
zie
,
mem_szi
e
};
size_t
localThreads
[
2
]
=
{
mem_s
ize
,
mem_siz
e
};
k
.
run
(
2
,
globalThreads
,
localThreads
,
false
);
remap
(
src
,
_dst
,
mapx
,
mapy
,
flags
&
cv
::
INTER_MAX
,
(
flags
&
CV_WARP_FILL_OUTLIERS
)
?
cv
::
BORDER_CONSTANT
:
cv
::
BORDER_TRANSPARENT
);
return
true
;
...
...
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