Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
cdddcc82
Commit
cdddcc82
authored
Apr 16, 2015
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed contrib code to match the HAL
parent
292b8fa6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
motempl.cpp
modules/optflow/src/motempl.cpp
+1
-1
depth_to_3d.h
modules/rgbd/src/depth_to_3d.h
+2
-2
sift.cpp
modules/xfeatures2d/src/sift.cpp
+6
-6
No files found.
modules/optflow/src/motempl.cpp
View file @
cdddcc82
...
...
@@ -212,7 +212,7 @@ void calcMotionGradient( InputArray _mhi, OutputArray _mask,
float
*
orient_row
=
orient
.
ptr
<
float
>
(
y
);
uchar
*
mask_row
=
mask
.
ptr
<
uchar
>
(
y
);
fastAtan2
(
dY_max_row
,
dX_min_row
,
orient_row
,
size
.
width
,
true
);
hal
::
fastAtan2
(
dY_max_row
,
dX_min_row
,
orient_row
,
size
.
width
,
true
);
// make orientation zero where the gradient is very small
for
(
x
=
0
;
x
<
size
.
width
;
x
++
)
...
...
modules/rgbd/src/depth_to_3d.h
View file @
cdddcc82
...
...
@@ -81,7 +81,7 @@ convertDepthToFloat(const cv::Mat& depth, const cv::Mat& mask, float scale, cv::
v_mat
((
int
)
n_points
,
0
)
=
(
float
)
v
;
T
depth_i
=
depth
.
at
<
T
>
(
v
,
u
);
if
(
cvIsNaN
(
depth_i
)
||
(
depth_i
==
std
::
numeric_limits
<
T
>::
min
())
||
(
depth_i
==
std
::
numeric_limits
<
T
>::
max
()))
if
(
cvIsNaN
(
(
float
)
depth_i
)
||
(
depth_i
==
std
::
numeric_limits
<
T
>::
min
())
||
(
depth_i
==
std
::
numeric_limits
<
T
>::
max
()))
z_mat
((
int
)
n_points
,
0
)
=
std
::
numeric_limits
<
float
>::
quiet_NaN
();
else
z_mat
((
int
)
n_points
,
0
)
=
depth_i
*
scale
;
...
...
@@ -111,7 +111,7 @@ convertDepthToFloat(const cv::Mat& depth, float scale, const cv::Mat &uv_mat, cv
{
T
depth_i
=
depth
.
at
<
T
>
((
int
)(
*
uv_iter
)[
1
],
(
int
)(
*
uv_iter
)[
0
]);
if
(
cvIsNaN
(
depth_i
)
||
(
depth_i
==
std
::
numeric_limits
<
T
>
::
min
())
if
(
cvIsNaN
(
(
float
)
depth_i
)
||
(
depth_i
==
std
::
numeric_limits
<
T
>
::
min
())
||
(
depth_i
==
std
::
numeric_limits
<
T
>
::
max
()))
*
z_mat_iter
=
std
::
numeric_limits
<
float
>::
quiet_NaN
();
else
...
...
modules/xfeatures2d/src/sift.cpp
View file @
cdddcc82
...
...
@@ -337,9 +337,9 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
len
=
k
;
// compute gradient values, orientations and the weights over the pixel neighborhood
exp
(
W
,
W
,
len
);
fastAtan2
(
Y
,
X
,
Ori
,
len
,
true
);
magnitude
(
X
,
Y
,
Mag
,
len
);
hal
::
exp
(
W
,
W
,
len
);
hal
::
fastAtan2
(
Y
,
X
,
Ori
,
len
,
true
);
hal
::
magnitude
(
X
,
Y
,
Mag
,
len
);
for
(
k
=
0
;
k
<
len
;
k
++
)
{
...
...
@@ -620,9 +620,9 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
}
len
=
k
;
fastAtan2
(
Y
,
X
,
Ori
,
len
,
true
);
magnitude
(
X
,
Y
,
Mag
,
len
);
exp
(
W
,
W
,
len
);
hal
::
fastAtan2
(
Y
,
X
,
Ori
,
len
,
true
);
hal
::
magnitude
(
X
,
Y
,
Mag
,
len
);
hal
::
exp
(
W
,
W
,
len
);
for
(
k
=
0
;
k
<
len
;
k
++
)
{
...
...
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