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
1e1a1855
Commit
1e1a1855
authored
Jul 31, 2018
by
luz.paz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Source typo fixes
parent
2003eb1b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
test_warp_affine.cpp
modules/cudawarping/test/test_warp_affine.cpp
+4
-4
test_warp_perspective.cpp
modules/cudawarping/test/test_warp_perspective.cpp
+4
-4
test_warp.cu
modules/cudev/test/test_warp.cu
+3
-3
hog.cpp
modules/objdetect/src/hog.cpp
+4
-4
No files found.
modules/cudawarping/test/test_warp_affine.cpp
View file @
1e1a1855
...
@@ -48,7 +48,7 @@ namespace opencv_test { namespace {
...
@@ -48,7 +48,7 @@ namespace opencv_test { namespace {
namespace
namespace
{
{
cv
::
Mat
createTransfomMatrix
(
cv
::
Size
srcSize
,
double
angle
)
cv
::
Mat
createTransfo
r
mMatrix
(
cv
::
Size
srcSize
,
double
angle
)
{
{
cv
::
Mat
M
(
2
,
3
,
CV_64FC1
);
cv
::
Mat
M
(
2
,
3
,
CV_64FC1
);
...
@@ -80,7 +80,7 @@ PARAM_TEST_CASE(BuildWarpAffineMaps, cv::cuda::DeviceInfo, cv::Size, Inverse)
...
@@ -80,7 +80,7 @@ PARAM_TEST_CASE(BuildWarpAffineMaps, cv::cuda::DeviceInfo, cv::Size, Inverse)
CUDA_TEST_P
(
BuildWarpAffineMaps
,
Accuracy
)
CUDA_TEST_P
(
BuildWarpAffineMaps
,
Accuracy
)
{
{
cv
::
Mat
M
=
createTransfomMatrix
(
size
,
CV_PI
/
4
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
size
,
CV_PI
/
4
);
cv
::
Mat
src
=
randomMat
(
randomSize
(
200
,
400
),
CV_8UC1
);
cv
::
Mat
src
=
randomMat
(
randomSize
(
200
,
400
),
CV_8UC1
);
cv
::
cuda
::
GpuMat
xmap
,
ymap
;
cv
::
cuda
::
GpuMat
xmap
,
ymap
;
...
@@ -207,7 +207,7 @@ PARAM_TEST_CASE(WarpAffine, cv::cuda::DeviceInfo, cv::Size, MatType, Inverse, In
...
@@ -207,7 +207,7 @@ PARAM_TEST_CASE(WarpAffine, cv::cuda::DeviceInfo, cv::Size, MatType, Inverse, In
CUDA_TEST_P
(
WarpAffine
,
Accuracy
)
CUDA_TEST_P
(
WarpAffine
,
Accuracy
)
{
{
cv
::
Mat
src
=
randomMat
(
size
,
type
);
cv
::
Mat
src
=
randomMat
(
size
,
type
);
cv
::
Mat
M
=
createTransfomMatrix
(
size
,
CV_PI
/
3
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
size
,
CV_PI
/
3
);
int
flags
=
interpolation
;
int
flags
=
interpolation
;
if
(
inverse
)
if
(
inverse
)
flags
|=
cv
::
WARP_INVERSE_MAP
;
flags
|=
cv
::
WARP_INVERSE_MAP
;
...
@@ -257,7 +257,7 @@ CUDA_TEST_P(WarpAffineNPP, Accuracy)
...
@@ -257,7 +257,7 @@ CUDA_TEST_P(WarpAffineNPP, Accuracy)
cv
::
Mat
src
=
readImageType
(
"stereobp/aloe-L.png"
,
type
);
cv
::
Mat
src
=
readImageType
(
"stereobp/aloe-L.png"
,
type
);
ASSERT_FALSE
(
src
.
empty
());
ASSERT_FALSE
(
src
.
empty
());
cv
::
Mat
M
=
createTransfomMatrix
(
src
.
size
(),
CV_PI
/
4
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
src
.
size
(),
CV_PI
/
4
);
int
flags
=
interpolation
;
int
flags
=
interpolation
;
if
(
inverse
)
if
(
inverse
)
flags
|=
cv
::
WARP_INVERSE_MAP
;
flags
|=
cv
::
WARP_INVERSE_MAP
;
...
...
modules/cudawarping/test/test_warp_perspective.cpp
View file @
1e1a1855
...
@@ -48,7 +48,7 @@ namespace opencv_test { namespace {
...
@@ -48,7 +48,7 @@ namespace opencv_test { namespace {
namespace
namespace
{
{
cv
::
Mat
createTransfomMatrix
(
cv
::
Size
srcSize
,
double
angle
)
cv
::
Mat
createTransfo
r
mMatrix
(
cv
::
Size
srcSize
,
double
angle
)
{
{
cv
::
Mat
M
(
3
,
3
,
CV_64FC1
);
cv
::
Mat
M
(
3
,
3
,
CV_64FC1
);
...
@@ -81,7 +81,7 @@ PARAM_TEST_CASE(BuildWarpPerspectiveMaps, cv::cuda::DeviceInfo, cv::Size, Invers
...
@@ -81,7 +81,7 @@ PARAM_TEST_CASE(BuildWarpPerspectiveMaps, cv::cuda::DeviceInfo, cv::Size, Invers
CUDA_TEST_P
(
BuildWarpPerspectiveMaps
,
Accuracy
)
CUDA_TEST_P
(
BuildWarpPerspectiveMaps
,
Accuracy
)
{
{
cv
::
Mat
M
=
createTransfomMatrix
(
size
,
CV_PI
/
4
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
size
,
CV_PI
/
4
);
cv
::
cuda
::
GpuMat
xmap
,
ymap
;
cv
::
cuda
::
GpuMat
xmap
,
ymap
;
cv
::
cuda
::
buildWarpPerspectiveMaps
(
M
,
inverse
,
size
,
xmap
,
ymap
);
cv
::
cuda
::
buildWarpPerspectiveMaps
(
M
,
inverse
,
size
,
xmap
,
ymap
);
...
@@ -210,7 +210,7 @@ PARAM_TEST_CASE(WarpPerspective, cv::cuda::DeviceInfo, cv::Size, MatType, Invers
...
@@ -210,7 +210,7 @@ PARAM_TEST_CASE(WarpPerspective, cv::cuda::DeviceInfo, cv::Size, MatType, Invers
CUDA_TEST_P
(
WarpPerspective
,
Accuracy
)
CUDA_TEST_P
(
WarpPerspective
,
Accuracy
)
{
{
cv
::
Mat
src
=
randomMat
(
size
,
type
);
cv
::
Mat
src
=
randomMat
(
size
,
type
);
cv
::
Mat
M
=
createTransfomMatrix
(
size
,
CV_PI
/
3
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
size
,
CV_PI
/
3
);
int
flags
=
interpolation
;
int
flags
=
interpolation
;
if
(
inverse
)
if
(
inverse
)
flags
|=
cv
::
WARP_INVERSE_MAP
;
flags
|=
cv
::
WARP_INVERSE_MAP
;
...
@@ -260,7 +260,7 @@ CUDA_TEST_P(WarpPerspectiveNPP, Accuracy)
...
@@ -260,7 +260,7 @@ CUDA_TEST_P(WarpPerspectiveNPP, Accuracy)
cv
::
Mat
src
=
readImageType
(
"stereobp/aloe-L.png"
,
type
);
cv
::
Mat
src
=
readImageType
(
"stereobp/aloe-L.png"
,
type
);
ASSERT_FALSE
(
src
.
empty
());
ASSERT_FALSE
(
src
.
empty
());
cv
::
Mat
M
=
createTransfomMatrix
(
src
.
size
(),
CV_PI
/
4
);
cv
::
Mat
M
=
createTransfo
r
mMatrix
(
src
.
size
(),
CV_PI
/
4
);
int
flags
=
interpolation
;
int
flags
=
interpolation
;
if
(
inverse
)
if
(
inverse
)
flags
|=
cv
::
WARP_INVERSE_MAP
;
flags
|=
cv
::
WARP_INVERSE_MAP
;
...
...
modules/cudev/test/test_warp.cu
View file @
1e1a1855
...
@@ -199,7 +199,7 @@ TEST(Resize, Downscale)
...
@@ -199,7 +199,7 @@ TEST(Resize, Downscale)
// warpAffine & warpPerspective
// warpAffine & warpPerspective
Mat createAffineTransfomMatrix(Size srcSize, float angle, bool perspective)
Mat createAffineTransfo
r
mMatrix(Size srcSize, float angle, bool perspective)
{
{
cv::Mat M(perspective ? 3 : 2, 3, CV_32FC1);
cv::Mat M(perspective ? 3 : 2, 3, CV_32FC1);
...
@@ -220,7 +220,7 @@ TEST(WarpAffine, Rotation)
...
@@ -220,7 +220,7 @@ TEST(WarpAffine, Rotation)
const Size size = randomSize(100, 400);
const Size size = randomSize(100, 400);
Mat src = randomMat(size, CV_32FC1, 0, 1);
Mat src = randomMat(size, CV_32FC1, 0, 1);
Mat M = createAffineTransfomMatrix(size, static_cast<float>(CV_PI / 4), false);
Mat M = createAffineTransfo
r
mMatrix(size, static_cast<float>(CV_PI / 4), false);
GpuMat_<float> d_src(src);
GpuMat_<float> d_src(src);
GpuMat_<float> d_M;
GpuMat_<float> d_M;
...
@@ -240,7 +240,7 @@ TEST(WarpPerspective, Rotation)
...
@@ -240,7 +240,7 @@ TEST(WarpPerspective, Rotation)
const Size size = randomSize(100, 400);
const Size size = randomSize(100, 400);
Mat src = randomMat(size, CV_32FC1, 0, 1);
Mat src = randomMat(size, CV_32FC1, 0, 1);
Mat M = createAffineTransfomMatrix(size, static_cast<float>(CV_PI / 4), true);
Mat M = createAffineTransfo
r
mMatrix(size, static_cast<float>(CV_PI / 4), true);
GpuMat_<float> d_src(src);
GpuMat_<float> d_src(src);
GpuMat_<float> d_M;
GpuMat_<float> d_M;
...
...
modules/objdetect/src/hog.cpp
View file @
1e1a1855
...
@@ -255,8 +255,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
...
@@ -255,8 +255,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
Mat_
<
float
>
_lut
(
1
,
256
);
Mat_
<
float
>
_lut
(
1
,
256
);
const
float
*
const
lut
=
&
_lut
(
0
,
0
);
const
float
*
const
lut
=
&
_lut
(
0
,
0
);
#if CV_SSE2
#if CV_SSE2
const
int
ind
e
ces
[]
=
{
0
,
1
,
2
,
3
};
const
int
ind
i
ces
[]
=
{
0
,
1
,
2
,
3
};
__m128i
idx
=
_mm_loadu_si128
((
const
__m128i
*
)
ind
e
ces
);
__m128i
idx
=
_mm_loadu_si128
((
const
__m128i
*
)
ind
i
ces
);
__m128i
ifour
=
_mm_set1_epi32
(
4
);
__m128i
ifour
=
_mm_set1_epi32
(
4
);
float
*
const
_data
=
&
_lut
(
0
,
0
);
float
*
const
_data
=
&
_lut
(
0
,
0
);
...
@@ -273,8 +273,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
...
@@ -273,8 +273,8 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
idx
=
_mm_add_epi32
(
idx
,
ifour
);
idx
=
_mm_add_epi32
(
idx
,
ifour
);
}
}
#elif CV_NEON
#elif CV_NEON
const
int
ind
e
ces
[]
=
{
0
,
1
,
2
,
3
};
const
int
ind
i
ces
[]
=
{
0
,
1
,
2
,
3
};
uint32x4_t
idx
=
*
(
uint32x4_t
*
)
ind
e
ces
;
uint32x4_t
idx
=
*
(
uint32x4_t
*
)
ind
i
ces
;
uint32x4_t
ifour
=
vdupq_n_u32
(
4
);
uint32x4_t
ifour
=
vdupq_n_u32
(
4
);
float
*
const
_data
=
&
_lut
(
0
,
0
);
float
*
const
_data
=
&
_lut
(
0
,
0
);
...
...
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