Check for __APPLE__ instead of __DARWIN__.

[movit] / diffusion_effect.h

diff --git a/diffusion_effect.h b/diffusion_effect.h
index 64d743d12eb923bd409b24ddd0d5de508ff5458c..64b94dd8dad11df184e3fb082ec622ab13186644 100644 (file)
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DIFFUSION_EFFECT_H
-#define _DIFFUSION_EFFECT_H 1
+#ifndef _MOVIT_DIFFUSION_EFFECT_H
+#define _MOVIT_DIFFUSION_EFFECT_H 1
 
 // There are many different effects that go under the name of "diffusion",
 // seemingly all of the inspired by the effect you get when you put a
@@ -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
@@ -58,5 +62,6 @@ private:
        float blurred_mix_amount;
 };
 
+}  // namespace movit
 
-#endif // !defined(_DIFFUSION_EFFECT_H)
+#endif // !defined(_MOVIT_DIFFUSION_EFFECT_H)