Merge branch 'master' into epoxy

[movit] / padding_effect.h

diff --git a/padding_effect.h b/padding_effect.h
index 797db7e990eedf867ba17f3377e1a518c6c1de4d..901f892b9dd14f999776f823bb897370f32d25d5 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -12,11 +12,13 @@
 // You may not change it after calling finalize(), since that could change the
 // graph (need_linear_light() etc. depend on the border color you choose).
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class PaddingEffect : public Effect {
 public:
        PaddingEffect();
@@ -33,10 +35,12 @@ public:
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
 private:
-       RGBATriplet border_color;
+       RGBATuple border_color;
        int input_width, input_height;
        int output_width, output_height;
        float top, left;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_PADDING_EFFECT_H)