Merge branch 'master' into epoxy

[movit] / white_balance_effect.h

diff --git a/white_balance_effect.h b/white_balance_effect.h
index 80416cba39340df11b0464a173e5ca07da5be3a5..f438b91507a00b579d9eac697a3f619ac4527096 100644 (file)
--- a/white_balance_effect.h
+++ b/white_balance_effect.h
@@ -1,14 +1,20 @@
-#ifndef _WHITE_BALANCE_EFFECT_H
-#define _WHITE_BALANCE_EFFECT_H 1
+#ifndef _MOVIT_WHITE_BALANCE_EFFECT_H
+#define _MOVIT_WHITE_BALANCE_EFFECT_H 1
 
 // Color correction in LMS color space.
 
+#include <epoxy/gl.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class WhiteBalanceEffect : public Effect {
 public:
        WhiteBalanceEffect();
        virtual std::string effect_type_id() const { return "WhiteBalanceEffect"; }
+       virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
        std::string output_fragment_shader();
 
        void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
@@ -22,4 +28,6 @@ private:
        float output_color_temperature;
 };
 
-#endif // !defined(_WHITE_BALANCE_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_WHITE_BALANCE_EFFECT_H)