Merge branch 'master' into epoxy

[movit] / mix_effect.h

diff --git a/mix_effect.h b/mix_effect.h
index 967c06b2ba59ac47b9ed21b7f1692f90bfdde854..9abe6010a86d1aabb4640759c99fef537cb4caae 100644 (file)
--- a/mix_effect.h
+++ b/mix_effect.h
@@ -1,11 +1,15 @@
-#ifndef _MIX_EFFECT_H
-#define _MIX_EFFECT_H 1
+#ifndef _MOVIT_MIX_EFFECT_H
+#define _MOVIT_MIX_EFFECT_H 1
 
 // Combine two images: a*x + b*y. If you set a within [0,1] and b=1-a,
 // you will get a fade; if not, you may get surprising results (consider alpha).
 
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class MixEffect : public Effect {
 public:
        MixEffect();
@@ -23,4 +27,6 @@ private:
        float strength_first, strength_second;
 };
 
-#endif // !defined(_MIX_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_MIX_EFFECT_H)