Convert a loop to range-based for.

[movit] / gamma_expansion_effect.h

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index 92f05171cd4d84ff08ad802cbef89138401c5d48..9565a3b0e4d5d0654bb1d6f197067e4a6d88af3e 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -9,12 +9,14 @@
 // Note that Movit's internal formats generally do not have enough accuracy
 // for 12-bit input or output.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
 #include "image_format.h"
 
+namespace movit {
+
 class GammaExpansionEffect : public Effect {
 private:
        // Should not be instantiated by end users.
@@ -22,19 +24,23 @@ private:
        friend class EffectChain;
 
 public:
-       virtual std::string effect_type_id() const { return "GammaExpansionEffect"; }
-       std::string output_fragment_shader();
-       virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       std::string effect_type_id() const override { return "GammaExpansionEffect"; }
+       std::string output_fragment_shader() override;
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;
 
-       virtual bool needs_linear_light() const { return false; }
-       virtual bool needs_srgb_primaries() const { return false; }
+       bool needs_linear_light() const override { return false; }
+       bool needs_srgb_primaries() const override { return false; }
+       bool strong_one_to_one_sampling() const override { return true; }
 
        // Actually processes its input in a nonlinear fashion,
        // but does not touch alpha, and we are a special case anyway.
-       virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
+       AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; }
 
 private:
        GammaCurve source_curve;
+       float uniform_linear_scale, uniform_c[5], uniform_beta;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_GAMMA_EXPANSION_EFFECT_H)