From 7c75097c046cc7089fdc59a758ed82ccabbdf2b4 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 18 Feb 2018 08:19:33 +0000 Subject: [PATCH] math/qwtplot3d-qt4, fix build with clang6. --- .../files/patch-src_qwt3d__lighting.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp diff --git a/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp b/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp new file mode 100644 index 000000000000..475f4f97d6d4 --- /dev/null +++ b/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp @@ -0,0 +1,18 @@ +src/qwt3d_lighting.cpp:178:27: error: non-constant-expression cannot be narrowed from type 'double' to +'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] + GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; + ^~~~~~~~~~~~~~~~~~~~~~ +src/qwt3d_lighting.cpp:178:27: note: insert an explicit cast to silence this issue + + +--- src/qwt3d_lighting.cpp.orig 2018-02-17 23:11:11 UTC ++++ src/qwt3d_lighting.cpp +@@ -175,7 +175,7 @@ void Plot3D::applyLight(unsigned light) + glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 ); + glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 ); + glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 ); +- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; ++ GLfloat lightPos[4] = { static_cast(lights_[light].shift.x), static_cast(lights_[light].shift.y), static_cast(lights_[light].shift.z), 1.0}; + GLenum le = lightEnum(light); + glLightfv(le, GL_POSITION, lightPos); + }