Redo FBO association yet again, this time per-texture.

[movit] / overlay_effect.h

diff --git a/overlay_effect.h b/overlay_effect.h
index 66ff31b94be55d19ffacb7714051baa2c785493c..489d8d78168c449ccf8bf6e35c86182732f1a04f 100644 (file)
--- a/overlay_effect.h
+++ b/overlay_effect.h
@@ -1,5 +1,5 @@
-#ifndef _OVERLAY_EFFECT_H
-#define _OVERLAY_EFFECT_H 1
+#ifndef _MOVIT_OVERLAY_EFFECT_H
+#define _MOVIT_OVERLAY_EFFECT_H 1
 
 // Put one image on top of another, using alpha where appropriate.
 // (If both images are the same aspect and the top image has alpha=1.0
@@ -14,6 +14,8 @@
 
 #include "effect.h"
 
+namespace movit {
+
 class OverlayEffect : public Effect {
 public:
        OverlayEffect();
@@ -31,4 +33,6 @@ public:
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 };
 
-#endif // !defined(_OVERLAY_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_OVERLAY_EFFECT_H)