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
f2971aeb
Commit
f2971aeb
authored
Jul 12, 2010
by
Yannick Verdie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ticket #458
parent
1c856283
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
highgui_c.h
modules/highgui/include/opencv2/highgui/highgui_c.h
+1
-1
window_QT.cpp
modules/highgui/src/window_QT.cpp
+2
-2
No files found.
modules/highgui/include/opencv2/highgui/highgui_c.h
View file @
f2971aeb
...
...
@@ -74,7 +74,7 @@ enum { CV_STYLE_NORMAL = 0,//QFont::StyleNormal,
//for color cvScalar(blue_component, green_component, red\_component[, alpha_component])
//and alpha= 0 <-> 0xFF (not transparent <-> transparent)
CVAPI
(
CvFont
)
cvFont_Qt
(
const
char
*
nameFont
,
int
pointSize
CV_DEFAULT
(
-
1
),
CvScalar
color
=
cvScalarAll
(
0
),
int
weight
CV_DEFAULT
(
CV_FONT_NORMAL
),
int
style
CV_DEFAULT
(
CV_STYLE_NORMAL
),
int
spacing
CV_DEFAULT
(
0
));
CVAPI
(
CvFont
)
cvFont_Qt
(
const
char
*
nameFont
,
int
pointSize
CV_DEFAULT
(
-
1
),
CvScalar
color
CV_DEFAULT
(
cvScalarAll
(
0
)
),
int
weight
CV_DEFAULT
(
CV_FONT_NORMAL
),
int
style
CV_DEFAULT
(
CV_STYLE_NORMAL
),
int
spacing
CV_DEFAULT
(
0
));
CVAPI
(
void
)
cvAddText
(
CvArr
*
img
,
const
char
*
text
,
CvPoint
org
,
CvFont
*
arg2
);
...
...
modules/highgui/src/window_QT.cpp
View file @
f2971aeb
...
...
@@ -1654,14 +1654,14 @@ void ViewPort::paintEvent(QPaintEvent* event)
#if defined(OPENCV_GL)
if
(
mode_display
==
CV_MODE_OPENGL
&&
on_openGL_draw3D
)
{
myPainter
.
beginNativePainting
();
//
myPainter.beginNativePainting();
setGL
(
width
(),
height
());
on_openGL_draw3D
(
on_openGL_param
);
//draw3D();
unsetGL
();
myPainter
.
endNativePainting
();
//
myPainter.endNativePainting();
}
#endif
...
...
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