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
35edad3e
Commit
35edad3e
authored
Mar 05, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix warnings
parent
45c4d3a6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
cuda_host_mem.cpp
modules/core/src/cuda_host_mem.cpp
+1
-1
opengl.cpp
modules/core/src/opengl.cpp
+2
-2
window_QT.cpp
modules/highgui/src/window_QT.cpp
+1
-1
No files found.
modules/core/src/cuda_host_mem.cpp
View file @
35edad3e
...
@@ -206,7 +206,7 @@ void cv::cuda::HostMem::create(int rows_, int cols_, int type_)
...
@@ -206,7 +206,7 @@ void cv::cuda::HostMem::create(int rows_, int cols_, int type_)
cols
=
cols_
;
cols
=
cols_
;
step
=
elemSize
()
*
cols
;
step
=
elemSize
()
*
cols
;
int
sz
[]
=
{
rows
,
cols
};
int
sz
[]
=
{
rows
,
cols
};
size_t
steps
[]
=
{
step
,
CV_ELEM_SIZE
(
type_
)
};
size_t
steps
[]
=
{
step
,
(
size_t
)
CV_ELEM_SIZE
(
type_
)
};
flags
=
updateContinuityFlag
(
flags
,
2
,
sz
,
steps
);
flags
=
updateContinuityFlag
(
flags
,
2
,
sz
,
steps
);
if
(
alloc_type
==
SHARED
)
if
(
alloc_type
==
SHARED
)
...
...
modules/core/src/opengl.cpp
View file @
35edad3e
...
@@ -1726,7 +1726,7 @@ void convertToGLTexture2D(InputArray src, Texture2D& texture)
...
@@ -1726,7 +1726,7 @@ void convertToGLTexture2D(InputArray src, Texture2D& texture)
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueAcquireGLObjects failed"
);
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueAcquireGLObjects failed"
);
size_t
offset
=
0
;
// TODO
size_t
offset
=
0
;
// TODO
size_t
dst_origin
[
3
]
=
{
0
,
0
,
0
};
size_t
dst_origin
[
3
]
=
{
0
,
0
,
0
};
size_t
region
[
3
]
=
{
u
.
cols
,
u
.
rows
,
1
};
size_t
region
[
3
]
=
{
(
size_t
)
u
.
cols
,
(
size_t
)
u
.
rows
,
1
};
status
=
clEnqueueCopyBufferToImage
(
q
,
clBuffer
,
clImage
,
offset
,
dst_origin
,
region
,
0
,
NULL
,
NULL
);
status
=
clEnqueueCopyBufferToImage
(
q
,
clBuffer
,
clImage
,
offset
,
dst_origin
,
region
,
0
,
NULL
,
NULL
);
if
(
status
!=
CL_SUCCESS
)
if
(
status
!=
CL_SUCCESS
)
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueCopyBufferToImage failed"
);
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueCopyBufferToImage failed"
);
...
@@ -1786,7 +1786,7 @@ void convertFromGLTexture2D(const Texture2D& texture, OutputArray dst)
...
@@ -1786,7 +1786,7 @@ void convertFromGLTexture2D(const Texture2D& texture, OutputArray dst)
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueAcquireGLObjects failed"
);
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueAcquireGLObjects failed"
);
size_t
offset
=
0
;
// TODO
size_t
offset
=
0
;
// TODO
size_t
src_origin
[
3
]
=
{
0
,
0
,
0
};
size_t
src_origin
[
3
]
=
{
0
,
0
,
0
};
size_t
region
[
3
]
=
{
u
.
cols
,
u
.
rows
,
1
};
size_t
region
[
3
]
=
{
(
size_t
)
u
.
cols
,
(
size_t
)
u
.
rows
,
1
};
status
=
clEnqueueCopyImageToBuffer
(
q
,
clImage
,
clBuffer
,
src_origin
,
region
,
offset
,
0
,
NULL
,
NULL
);
status
=
clEnqueueCopyImageToBuffer
(
q
,
clImage
,
clBuffer
,
src_origin
,
region
,
offset
,
0
,
NULL
,
NULL
);
if
(
status
!=
CL_SUCCESS
)
if
(
status
!=
CL_SUCCESS
)
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueCopyImageToBuffer failed"
);
CV_Error
(
cv
::
Error
::
OpenCLApiCallError
,
"OpenCL: clEnqueueCopyImageToBuffer failed"
);
...
...
modules/highgui/src/window_QT.cpp
View file @
35edad3e
...
@@ -103,7 +103,7 @@ CV_IMPL CvFont cvFontQt(const char* nameFont, int pointSize,CvScalar color,int w
...
@@ -103,7 +103,7 @@ CV_IMPL CvFont cvFontQt(const char* nameFont, int pointSize,CvScalar color,int w
float dx;//spacing letter in Qt (0 default) in pixel
float dx;//spacing letter in Qt (0 default) in pixel
int line_type;//<- pointSize in Qt
int line_type;//<- pointSize in Qt
*/
*/
CvFont
f
=
{
nameFont
,
color
,
style
,
NULL
,
NULL
,
NULL
,
0
,
0
,
0
,
weight
,
spacing
,
pointSize
};
CvFont
f
=
{
nameFont
,
color
,
style
,
NULL
,
NULL
,
NULL
,
0
,
0
,
0
,
weight
,
(
float
)
spacing
,
pointSize
};
return
f
;
return
f
;
}
}
...
...
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