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

[movit] / unsharp_mask_effect.cpp

diff --git a/unsharp_mask_effect.cpp b/unsharp_mask_effect.cpp
index 545910f2af7519636ec91e32cfb1d586aa1694df..9c6804917eef8dc44b6fd5b8ca5670976951e0ad 100644 (file)
--- a/unsharp_mask_effect.cpp
+++ b/unsharp_mask_effect.cpp
@@ -1,18 +1,22 @@
-#include <math.h>
 #include <assert.h>
+#include <vector>
 
-#include "unsharp_mask_effect.h"
 #include "blur_effect.h"
-#include "mix_effect.h"
 #include "effect_chain.h"
+#include "mix_effect.h"
+#include "unsharp_mask_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 UnsharpMaskEffect::UnsharpMaskEffect()
        : blur(new BlurEffect),
          mix(new MixEffect)
 {
-       mix->set_float("strength_first", 1.0f);
-       mix->set_float("strength_second", -0.3f);
+       CHECK(mix->set_float("strength_first", 1.0f));
+       CHECK(mix->set_float("strength_second", -0.3f));
 }
 
 void UnsharpMaskEffect::rewrite_graph(EffectChain *graph, Node *self)
@@ -30,10 +34,12 @@ void UnsharpMaskEffect::rewrite_graph(EffectChain *graph, Node *self)
        self->disabled = true;
 }
 
-bool UnsharpMaskEffect::set_float(const std::string &key, float value) {
+bool UnsharpMaskEffect::set_float(const string &key, float value) {
        if (key == "amount") {
                bool ok = mix->set_float("strength_first", 1.0f + value);
                return ok && mix->set_float("strength_second", -value);
        }
        return blur->set_float(key, value);
 }
+
+}  // namespace movit