mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

x11-clocks/glclock: Fix build with Clang 6

Browse Source 
GLObject.cpp:843:22: error: non-constant-expression cannot be narrowed from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
        GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ;
                            ^~~~~~~~~~~~~~

http://beefy12.nyi.freebsd.org/data/head-amd64-default/p474051_s336054/logs/glclock-6.0.b6.0_6.log
This commit is contained in:
Tobias Kortkamp 2018-07-09 12:08:09 +00:00
parent 2c9a1b098a
commit c0156644ae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=474251
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11-clocks/glclock/files/patch-GLObject.cpp Normal file
View File

@ -0,0 +1,15 @@
GLObject.cpp:843:22: error: non-constant-expression cannot be narrowed from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ;
^~~~~~~~~~~~~~
--- GLObject.cpp.orig 2018-07-09 11:47:42 UTC
+++ GLObject.cpp
@@ -840,7 +840,7 @@ void SetDirectionalLight(GLenum light, GLfloat pos[4],
GLfloat amb, GLfloat specularFlag, GLfloat bright, GLfloat *modulate)
{
GLfloat color[4] = { colorRGBA[0], colorRGBA[1], colorRGBA[2], 1.0f } ; // colorRGBA[3] } ;
- GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ;
+ GLfloat lamb[4] = { color[0] * 0.1f, color[1] * 0.1f, color[2] * 0.1f, 1.0f } ;
static GLfloat u_pos[4] ;
static GLfloat spec[4] = { 0.0f, 0.0f, 0.0f, 1.0f } ;