Fixed build on MacOS with clang in C++11 mode.
avfvideowidget.mm:120:9: error: non-constant-expression cannot be narrowed from type 'int' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
x1, y1, zValue,
^~
Change-Id: I5a08bf8b53cf029dbdfaeaa03f4babd6d49d62ad
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
6b4994c265
commit
945e8c9f8e
@@ -103,11 +103,11 @@ void AVFVideoWidget::paintGL()
|
||||
return;
|
||||
|
||||
QRect targetRect = displayRect();
|
||||
int x1 = targetRect.left();
|
||||
int x2 = targetRect.right();
|
||||
int y1 = targetRect.bottom();
|
||||
int y2 = targetRect.top();
|
||||
int zValue = 0;
|
||||
GLfloat x1 = targetRect.left();
|
||||
GLfloat x2 = targetRect.right();
|
||||
GLfloat y1 = targetRect.bottom();
|
||||
GLfloat y2 = targetRect.top();
|
||||
GLfloat zValue = 0;
|
||||
|
||||
const GLfloat textureCoordinates[] = {
|
||||
0, 0,
|
||||
|
||||
Reference in New Issue
Block a user