From 8d188de139bc0b66a70d806ea06d5c98d143b05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Fri, 6 Feb 2015 04:56:25 +0100
Subject: [PATCH 2/4] Suppress Wnarrow warnings.
---
k3dsdk/utility_gl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k3dsdk/utility_gl.h b/k3dsdk/utility_gl.h
index 45e7eb3..3809143 100644
--- a/k3dsdk/utility_gl.h
+++ b/k3dsdk/utility_gl.h
@@ -104,7 +104,7 @@ inline void color3d(const color& Color)
/// Passes a k3d::color to glMaterialfv()
inline void material(GLenum Face, GLenum PName, const color& Color, double Alpha = 1.0)
{
- GLfloat color[] = { Color.red, Color.green, Color.blue, Alpha };
+ GLfloat color[] = { static_cast<GLfloat>(Color.red), static_cast<GLfloat>(Color.green), static_cast<GLfloat>(Color.blue), static_cast<GLfloat>(Alpha) };
glMaterialfv(Face, PName, color);
}
--
2.5.0