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
f0f87ebf
Commit
f0f87ebf
authored
Feb 22, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed compilation error under linux
parent
2d304809
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
element_operations.cpp
modules/gpu/src/element_operations.cpp
+2
-4
gftt.cpp
modules/gpu/src/gftt.cpp
+1
-1
pyrlk.cpp
modules/gpu/src/pyrlk.cpp
+0
-2
No files found.
modules/gpu/src/element_operations.cpp
View file @
f0f87ebf
...
...
@@ -654,11 +654,9 @@ void cv::gpu::multiply(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, doub
namespace
{
bool
isIntScalar
(
Scalar
sc
)
inline
bool
isIntScalar
(
Scalar
sc
)
{
Scalar_
<
int
>
isc
(
sc
);
return
sc
.
val
[
0
]
==
isc
.
val
[
0
]
&&
sc
.
val
[
1
]
==
isc
.
val
[
1
]
&&
sc
.
val
[
2
]
==
isc
.
val
[
2
]
&&
sc
.
val
[
3
]
==
isc
.
val
[
3
];
return
sc
.
val
[
0
]
==
static_cast
<
int
>
(
sc
.
val
[
0
])
&&
sc
.
val
[
1
]
==
static_cast
<
int
>
(
sc
.
val
[
1
])
&&
sc
.
val
[
2
]
==
static_cast
<
int
>
(
sc
.
val
[
2
])
&&
sc
.
val
[
3
]
==
static_cast
<
int
>
(
sc
.
val
[
3
]);
}
}
...
...
modules/gpu/src/gftt.cpp
View file @
f0f87ebf
...
...
@@ -153,7 +153,7 @@ void cv::gpu::GoodFeaturesToTrackDetector_GPU::operator ()(const GpuMat& image,
tmp2
.
push_back
(
p
);
if
(
maxCorners
>
0
&&
tmp2
.
size
()
==
maxCorners
)
if
(
maxCorners
>
0
&&
tmp2
.
size
()
==
static_cast
<
size_t
>
(
maxCorners
)
)
break
;
}
}
...
...
modules/gpu/src/pyrlk.cpp
View file @
f0f87ebf
...
...
@@ -83,8 +83,6 @@ void cv::gpu::PyrLKOpticalFlow::calcSharrDeriv(const GpuMat& src, GpuMat& dIdx,
ensureSizeIsEnough
(
src
.
size
(),
CV_MAKETYPE
(
CV_16S
,
cn
),
dx_calcBuf_
);
ensureSizeIsEnough
(
src
.
size
(),
CV_MAKETYPE
(
CV_16S
,
cn
),
dy_calcBuf_
);
const
int
colsn
=
src
.
cols
*
cn
;
calcSharrDeriv_gpu
(
src
,
dx_calcBuf_
,
dy_calcBuf_
,
dIdx
,
dIdy
,
cn
);
}
...
...
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