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
420dd222
Commit
420dd222
authored
Oct 01, 2012
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
parent
dc568d4d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
fast.cpp
modules/features2d/src/fast.cpp
+4
-1
fast_score.cpp
modules/features2d/src/fast_score.cpp
+2
-0
cap_v4l.cpp
modules/highgui/src/cap_v4l.cpp
+1
-1
No files found.
modules/features2d/src/fast.cpp
View file @
420dd222
...
...
@@ -89,7 +89,9 @@ void FAST_t(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, bo
if
(
i
<
img
.
rows
-
3
)
{
j
=
3
;
#if 0 //CV_SSE2
#if CV_SSE2
if
(
patternSize
==
16
)
{
for
(;
j
<
img
.
cols
-
16
-
3
;
j
+=
16
,
ptr
+=
16
)
{
__m128i
m0
,
m1
;
...
...
@@ -145,6 +147,7 @@ void FAST_t(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, bo
curr
[
j
+
k
]
=
(
uchar
)
cornerScore
<
patternSize
>
(
ptr
+
k
,
pixel
,
threshold
);
}
}
}
#endif
for
(
;
j
<
img
.
cols
-
3
;
j
++
,
ptr
++
)
{
...
...
modules/features2d/src/fast_score.cpp
View file @
420dd222
...
...
@@ -78,6 +78,7 @@ void makeOffsets(int pixel[25], int rowStride, int patternSize)
pixel
[
k
]
=
pixel
[
k
-
patternSize
];
}
#if 0
static void testCorner(const uchar* ptr, const int pixel[], int K, int N, int threshold) {
// check that with the computed "threshold" the pixel is still a corner
// and that with the increased-by-1 "threshold" the pixel is not a corner anymore
...
...
@@ -111,6 +112,7 @@ static void testCorner(const uchar* ptr, const int pixel[], int K, int N, int th
(delta == 1 && std::max(c0, c1) <= K) );
}
}
#endif
template
<>
int
cornerScore
<
16
>
(
const
uchar
*
ptr
,
const
int
pixel
[],
int
threshold
)
...
...
modules/highgui/src/cap_v4l.cpp
View file @
420dd222
...
...
@@ -1432,7 +1432,7 @@ move_420_block(int yTL, int yTR, int yBL, int yBR, int u, int v,
static
inline
void
move_411_block
(
int
yTL
,
int
yTR
,
int
yBL
,
int
yBR
,
int
u
,
int
v
,
int
rowPixels
,
unsigned
char
*
rgb
)
int
/*rowPixels*/
,
unsigned
char
*
rgb
)
{
const
int
rvScale
=
91881
;
const
int
guScale
=
-
22553
;
...
...
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