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
06776b61
Commit
06776b61
authored
Dec 03, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings
parent
05d842bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
opengl_interop.cpp
modules/core/src/opengl_interop.cpp
+6
-0
perf_core.cpp
modules/gpu/perf/perf_core.cpp
+1
-1
No files found.
modules/core/src/opengl_interop.cpp
View file @
06776b61
...
@@ -536,6 +536,7 @@ cv::GlBuffer::GlBuffer(InputArray arr, Target target, bool autoRelease) : rows_(
...
@@ -536,6 +536,7 @@ cv::GlBuffer::GlBuffer(InputArray arr, Target target, bool autoRelease) : rows_(
#ifndef HAVE_OPENGL
#ifndef HAVE_OPENGL
(
void
)
arr
;
(
void
)
arr
;
(
void
)
target
;
(
void
)
target
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
const
int
kind
=
arr
.
kind
();
const
int
kind
=
arr
.
kind
();
...
@@ -582,6 +583,7 @@ void cv::GlBuffer::create(int arows, int acols, int atype, Target target, bool a
...
@@ -582,6 +583,7 @@ void cv::GlBuffer::create(int arows, int acols, int atype, Target target, bool a
(
void
)
acols
;
(
void
)
acols
;
(
void
)
atype
;
(
void
)
atype
;
(
void
)
target
;
(
void
)
target
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
if
(
rows_
!=
arows
||
cols_
!=
acols
||
type_
!=
atype
)
if
(
rows_
!=
arows
||
cols_
!=
acols
||
type_
!=
atype
)
...
@@ -622,6 +624,7 @@ void cv::GlBuffer::copyFrom(InputArray arr, Target target, bool autoRelease)
...
@@ -622,6 +624,7 @@ void cv::GlBuffer::copyFrom(InputArray arr, Target target, bool autoRelease)
#ifndef HAVE_OPENGL
#ifndef HAVE_OPENGL
(
void
)
arr
;
(
void
)
arr
;
(
void
)
target
;
(
void
)
target
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
const
int
kind
=
arr
.
kind
();
const
int
kind
=
arr
.
kind
();
...
@@ -980,6 +983,7 @@ cv::GlTexture2D::GlTexture2D(InputArray arr, bool autoRelease) : rows_(0), cols_
...
@@ -980,6 +983,7 @@ cv::GlTexture2D::GlTexture2D(InputArray arr, bool autoRelease) : rows_(0), cols_
{
{
#ifndef HAVE_OPENGL
#ifndef HAVE_OPENGL
(
void
)
arr
;
(
void
)
arr
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
const
int
kind
=
arr
.
kind
();
const
int
kind
=
arr
.
kind
();
...
@@ -1050,6 +1054,7 @@ void cv::GlTexture2D::create(int arows, int acols, Format aformat, bool autoRele
...
@@ -1050,6 +1054,7 @@ void cv::GlTexture2D::create(int arows, int acols, Format aformat, bool autoRele
(
void
)
arows
;
(
void
)
arows
;
(
void
)
acols
;
(
void
)
acols
;
(
void
)
aformat
;
(
void
)
aformat
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
if
(
rows_
!=
arows
||
cols_
!=
acols
||
format_
!=
aformat
)
if
(
rows_
!=
arows
||
cols_
!=
acols
||
format_
!=
aformat
)
...
@@ -1089,6 +1094,7 @@ void cv::GlTexture2D::copyFrom(InputArray arr, bool autoRelease)
...
@@ -1089,6 +1094,7 @@ void cv::GlTexture2D::copyFrom(InputArray arr, bool autoRelease)
{
{
#ifndef HAVE_OPENGL
#ifndef HAVE_OPENGL
(
void
)
arr
;
(
void
)
arr
;
(
void
)
autoRelease
;
throw_nogl
();
throw_nogl
();
#else
#else
const
int
kind
=
arr
.
kind
();
const
int
kind
=
arr
.
kind
();
...
...
modules/gpu/perf/perf_core.cpp
View file @
06776b61
...
@@ -1859,7 +1859,7 @@ PERF_TEST_P(Sz_Depth, Core_CountNonZero, Combine(
...
@@ -1859,7 +1859,7 @@ PERF_TEST_P(Sz_Depth, Core_CountNonZero, Combine(
cv
::
Mat
src
(
size
,
depth
);
cv
::
Mat
src
(
size
,
depth
);
fillRandom
(
src
);
fillRandom
(
src
);
int
dst
;
int
dst
=
0
;
if
(
PERF_RUN_GPU
())
if
(
PERF_RUN_GPU
())
{
{
...
...
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