Convert a loop to range-based for.

[movit] / lift_gamma_gain_effect.h

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index 131957009a37bd35ccc954035f05a85ac03e358f..6e2ea19a4d54231620d6eb6039e67571a98e5c16 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -1,5 +1,5 @@
-#ifndef _LIFT_GAMMA_GAIN_EFFECT_H
-#define _LIFT_GAMMA_GAIN_EFFECT_H 1
+#ifndef _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H
+#define _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H 1
 
 // A simple lift/gamma/gain effect, used for color grading.
 //
@@ -16,19 +16,32 @@
 // rest of the curve relatively little. Thus, we actually convert to gamma 2.2
 // before lift, and then back again afterwards. (Gain and gamma are,
 // up to constants, commutative with the de-gamma operation.)
+//
+// Also, gamma is a case where we would not want premultiplied alpha.
+// Thus, we have to divide away alpha first, and then re-multiply it back later.
+
+#include <epoxy/gl.h>
+#include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class LiftGammaGainEffect : public Effect {
 public:
        LiftGammaGainEffect();
-       virtual std::string effect_type_id() const { return "LiftGammaGainEffect"; }
-       std::string output_fragment_shader();
+       std::string effect_type_id() const override { return "LiftGammaGainEffect"; }
+       AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
+       bool strong_one_to_one_sampling() const override { return true; }
+       std::string output_fragment_shader() override;
 
-       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;
 
 private:
        RGBTriplet lift, gamma, gain;
+       RGBTriplet uniform_gain_pow_inv_gamma, uniform_inv_gamma22;
 };
 
-#endif // !defined(_LIFT_GAMMA_GAIN_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_LIFT_GAMMA_GAIN_EFFECT_H)