From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 21 Jan 2013 21:41:18 +0000 (+0100)
Subject: Fix a narrowing conversion within {} in PaddingEffect (C++11 compatibility).
X-Git-Tag: 1.0~149^2~4
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=7702ea7f05b7a3ffc625e054b14b784d0029f561

Fix a narrowing conversion within {} in PaddingEffect (C++11 compatibility).
---

diff --git a/padding_effect.cpp b/padding_effect.cpp
index 9d6e292..2e428c4 100644
--- a/padding_effect.cpp
+++ b/padding_effect.cpp
@@ -46,14 +46,14 @@ void PaddingEffect::set_gl_state(GLuint glsl_program_num, const std::string &pre
 	// than losing a pixel in the common cases of integer shift.
 	// Thus the 1e-3 fudge factors.
 	float texcoord_min[2] = {
-		(0.5f - 1e-3) / input_width,
-		(0.5f - 1e-3) / input_height
+		float((0.5f - 1e-3) / input_width),
+		float((0.5f - 1e-3) / input_height)
 	};
 	set_uniform_vec2(glsl_program_num, prefix, "texcoord_min", texcoord_min);
 
 	float texcoord_max[2] = {
-		1.0f - (0.5f - 1e-3) / input_width,
-		1.0f - (0.5f - 1e-3) / input_height
+		float(1.0f - (0.5f - 1e-3) / input_width),
+		float(1.0f - (0.5f - 1e-3) / input_height)
 	};
 	set_uniform_vec2(glsl_program_num, prefix, "texcoord_max", texcoord_max);
 }