Correct the number of blur taps read.

[movit] / blur_effect.h

diff --git a/blur_effect.h b/blur_effect.h
index b68094755bfe6188c801ebfbae222cd89870a0a6..ad269f558e57c7112ab1ec07732d227705783048 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -1,5 +1,5 @@
-#ifndef _BLUR_EFFECT_H
-#define _BLUR_EFFECT_H 1
+#ifndef _MOVIT_BLUR_EFFECT_H
+#define _MOVIT_BLUR_EFFECT_H 1
 
 // A separable 2D blur implemented by a combination of mipmap filtering
 // and convolution (essentially giving a convolution with a piecewise linear
@@ -9,8 +9,17 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleBlurPassEffect behind the scenes).
 
+#include <epoxy/gl.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
+class EffectChain;
+class Node;
 class SingleBlurPassEffect;
 
 class BlurEffect : public Effect {
@@ -24,7 +33,6 @@ public:
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_mipmaps() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
-       virtual AlphaHandling alpha_handling() const { return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -58,6 +66,7 @@ public:
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_mipmaps() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {
@@ -66,9 +75,11 @@ public:
        }
        virtual bool changes_output_size() const { return true; }
 
-       virtual void get_output_size(unsigned *width, unsigned *height) const {
+       virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
                *width = this->width;
                *height = this->height;
+               *virtual_width = this->virtual_width;
+               *virtual_height = this->virtual_height;
        }
 
        void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
@@ -80,7 +91,9 @@ private:
        BlurEffect *parent;
        float radius;
        Direction direction;
-       int width, height;
+       int width, height, virtual_width, virtual_height;
 };
 
-#endif // !defined(_BLUR_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_BLUR_EFFECT_H)