Fix an issue where a (cached) shader program could be used from multiple

[movit] / glow_effect.cpp

diff --git a/glow_effect.cpp b/glow_effect.cpp
index 86a3d7f407cf73c14066a6a1e9cbe2bef09afcc5..778c55752fecceb984e4a9f97d39ba7cc4186e9d 100644 (file)
--- a/glow_effect.cpp
+++ b/glow_effect.cpp
@@ -7,6 +7,10 @@
 #include "mix_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 GlowEffect::GlowEffect()
        : blur(new BlurEffect),
          cutoff(new HighlightCutoffEffect),
@@ -35,7 +39,7 @@ void GlowEffect::rewrite_graph(EffectChain *graph, Node *self)
        self->disabled = true;
 }
 
-bool GlowEffect::set_float(const std::string &key, float value) {
+bool GlowEffect::set_float(const string &key, float value) {
        if (key == "blurred_mix_amount") {
                return mix->set_float("strength_second", value);
        }
@@ -51,7 +55,9 @@ HighlightCutoffEffect::HighlightCutoffEffect()
        register_float("cutoff", &cutoff);
 }
 
-std::string HighlightCutoffEffect::output_fragment_shader()
+string HighlightCutoffEffect::output_fragment_shader()
 {
        return read_file("highlight_cutoff_effect.frag");
 }
+
+}  // namespace movit