Merge branch 'master' into epoxy

[movit] / padding_effect.h

diff --git a/padding_effect.h b/padding_effect.h
index a836ba208cc4c096fad3d0b9c7de6cc2da20ae7c..901f892b9dd14f999776f823bb897370f32d25d5 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -1,5 +1,5 @@
-#ifndef _PADDING_EFFECT_H
-#define _PADDING_EFFECT_H 1
+#ifndef _MOVIT_PADDING_EFFECT_H
+#define _MOVIT_PADDING_EFFECT_H 1
 
 // Takes an image and pads it to fit a larger image, or crops it to fit a smaller one
 // (although the latter is implemented slightly less efficiently, and you cannot both
@@ -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;
 };
 
-#endif // !defined(_PADDING_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_PADDING_EFFECT_H)