Date: Sun, 18 Feb 2018 08:19:33 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462204 - head/math/qwtplot3d-qt4/files Message-ID: <201802180819.w1I8JX51096748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Feb 18 08:19:33 2018 New Revision: 462204 URL: https://svnweb.freebsd.org/changeset/ports/462204 Log: math/qwtplot3d-qt4, fix build with clang6. Added: head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp (contents, props changed) Added: head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp Sun Feb 18 08:19:33 2018 (r462204) @@ -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<GLfloat>(lights_[light].shift.x), static_cast<GLfloat>(lights_[light].shift.y), static_cast<GLfloat>(lights_[light].shift.z), 1.0}; + GLenum le = lightEnum(light); + glLightfv(le, GL_POSITION, lightPos); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802180819.w1I8JX51096748>