<sys/time.h> is needed for gettimeofday.

[movit] / lift_gamma_gain_effect.cpp

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index acfeb86875a8841aabbc91a8602186713371087e..8be3a7692ea35b782ffbbd7f381d25e7841f1338 100644 (file)
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -10,13 +10,11 @@
 LiftGammaGainEffect::LiftGammaGainEffect()
        : lift(0.0f, 0.0f, 0.0f),
          gamma(1.0f, 1.0f, 1.0f),
-         gain(1.0f, 1.0f, 1.0f),
-         saturation(1.0f)
+         gain(1.0f, 1.0f, 1.0f)
 {
        register_vec3("lift", (float *)&lift);
        register_vec3("gamma", (float *)&gamma);
        register_vec3("gain", (float *)&gain);
-       register_float("saturation", &saturation);
 }
 
 std::string LiftGammaGainEffect::output_glsl()
@@ -24,7 +22,7 @@ std::string LiftGammaGainEffect::output_glsl()
        return read_file("lift_gamma_gain_effect.glsl");
 }
 
-void LiftGammaGainEffect::set_uniforms(GLhandleARB glsl_program_num, const std::string &prefix)
+void LiftGammaGainEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix)
 {
        Effect::set_uniforms(glsl_program_num, prefix);
 
@@ -38,5 +36,5 @@ void LiftGammaGainEffect::set_uniforms(GLhandleARB glsl_program_num, const std::
                2.2f / gamma.r,
                2.2f / gamma.g,
                2.2f / gamma.b);
-       set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&gain_pow_inv_gamma);
+       set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&inv_gamma_22);
 }