From: Steinar H. Gunderson Date: Sun, 16 Mar 2014 21:16:07 +0000 (+0100) Subject: Fix a C++11 incompatibility. X-Git-Tag: 1.0.1~1 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=1cd138ecb70146f29af914bcd0ff36258feb88c7 Fix a C++11 incompatibility. --- diff --git a/complex_modulate_effect.cpp b/complex_modulate_effect.cpp index 7048608..6af589c 100644 --- a/complex_modulate_effect.cpp +++ b/complex_modulate_effect.cpp @@ -25,7 +25,7 @@ void ComplexModulateEffect::set_gl_state(GLuint glsl_program_num, const string & { Effect::set_gl_state(glsl_program_num, prefix, sampler_num); - float num_repeats[] = { num_repeats_x, num_repeats_y }; + float num_repeats[] = { float(num_repeats_x), float(num_repeats_y) }; set_uniform_vec2(glsl_program_num, prefix, "num_repeats", num_repeats); // Set the secondary input to repeat (and nearest while we're at it).