Merge branch 'master' into epoxy

[movit] / dither_effect.h

diff --git a/dither_effect.h b/dither_effect.h
index cad6488921b67c5f60a3a1ac17fb97dec440b474..9818603c2a46f4a659628b68c03be5fed3f868ac 100644 (file)
--- a/dither_effect.h
+++ b/dither_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DITHER_EFFECT_H
-#define _DITHER_EFFECT_H 1
+#ifndef _MOVIT_DITHER_EFFECT_H
+#define _MOVIT_DITHER_EFFECT_H 1
 
 // Implements simple rectangular-PDF dither.
 //
@@ -43,8 +43,13 @@
 // like many LCD monitors do, but it starts to get very hairy, again, for limited gains.)
 // The dither is also deterministic across runs.
 
+#include <epoxy/gl.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class DitherEffect : public Effect {
 private:
        // Should not be instantiated by end users;
@@ -72,7 +77,8 @@ private:
        int texture_width, texture_height;
 
        GLuint texnum;
-       bool need_texture_update;
 };
 
-#endif // !defined(_DITHER_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_DITHER_EFFECT_H)