Release Movit 1.3.2. (From a branch, since I do not want to break ABI compatibility...

[movit] / diffusion_effect.h

diff --git a/diffusion_effect.h b/diffusion_effect.h
index 390787d9a3dc4c54c2dd8408538fd43d480ab471..77625ae439568b8fb6f043b5da796ddad067490d 100644 (file)
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -12,12 +12,14 @@
 // where we first blur the picture, and then overlay it on the original
 // using the original as a matte.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class BlurEffect;
 class EffectChain;
 class Node;
@@ -26,6 +28,7 @@ class OverlayMatteEffect;
 class DiffusionEffect : public Effect {
 public:
        DiffusionEffect();
+       ~DiffusionEffect();
        virtual std::string effect_type_id() const { return "DiffusionEffect"; }
 
        virtual void rewrite_graph(EffectChain *graph, Node *self);
@@ -41,6 +44,7 @@ public:
 private:
        BlurEffect *blur;
        OverlayMatteEffect *overlay_matte;
+       bool owns_overlay_matte;
 };
 
 // Used internally by DiffusionEffect; combines the blurred and the original
@@ -53,10 +57,12 @@ public:
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        unsigned num_inputs() const { return 2; }
+       virtual bool one_to_one_sampling() const { return true; }
 
 private:
        float blurred_mix_amount;
 };
 
+}  // namespace movit
 
 #endif // !defined(_MOVIT_DIFFUSION_EFFECT_H)