Merge branch 'master' into epoxy

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index b66ca6fe4ba30bd2ec817a634b6255bd2e316eee..24e637260ea97489d54080bef521572bc68d8b05 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1
 
 // High-quality image resizing, either up or down.
 //
@@ -15,13 +15,15 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class EffectChain;
 class Node;
 class SingleResamplePassEffect;
@@ -36,7 +38,6 @@ public:
        // down quite a lot.
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
-       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -70,6 +71,7 @@ public:
 
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {
@@ -99,4 +101,6 @@ private:
        float slice_height;
 };
 
-#endif // !defined(_RESAMPLE_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)