Another case of NULL initialization to keep Coverity happy.

[movit] / blur_effect.h

diff --git a/blur_effect.h b/blur_effect.h
index 9bacd535efb69ffdbf39192f8b678c00fec472c8..b68094755bfe6188c801ebfbae222cd89870a0a6 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -17,11 +17,16 @@ class BlurEffect : public Effect {
 public:
        BlurEffect();
 
+       virtual std::string effect_type_id() const { return "BlurEffect"; }
+
        // We want this for the same reason as ResizeEffect; we could end up scaling
        // down quite a lot.
        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);
 
        virtual std::string output_fragment_shader() {
                assert(false);
@@ -30,7 +35,7 @@ public:
                assert(false);
        }
 
-       virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);
+       virtual void rewrite_graph(EffectChain *graph, Node *self);
        virtual bool set_float(const std::string &key, float value);
        
 private:
@@ -38,17 +43,27 @@ private:
        
        float radius;
        SingleBlurPassEffect *hpass, *vpass;
+       unsigned input_width, input_height;
 };
 
 class SingleBlurPassEffect : public Effect {
 public:
-       SingleBlurPassEffect();
+       // If parent is non-NULL, calls to inform_input_size will be forwarded
+       // so that it can make reasonable decisions for both blur passes.
+       SingleBlurPassEffect(BlurEffect *parent);
+       virtual std::string effect_type_id() const { return "SingleBlurPassEffect"; }
+
        std::string output_fragment_shader();
 
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_mipmaps() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
 
+       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
+               if (parent != NULL) {
+                       parent->inform_input_size(input_num, width, height);
+               }
+       }
        virtual bool changes_output_size() const { return true; }
 
        virtual void get_output_size(unsigned *width, unsigned *height) const {
@@ -62,6 +77,7 @@ public:
        enum Direction { HORIZONTAL = 0, VERTICAL = 1 };
 
 private:
+       BlurEffect *parent;
        float radius;
        Direction direction;
        int width, height;