Rename the OutputAlphaFormat enums; they had gotten inconsistent after the last alpha...

[movit] / blur_effect.h

diff --git a/blur_effect.h b/blur_effect.h
index b68094755bfe6188c801ebfbae222cd89870a0a6..4af11a2b16a388ca6435e03b3d500eb2946039c3 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -24,7 +24,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_AND_OUTPUT_ALPHA_PREMULTIPLIED; }
+       virtual AlphaHandling alpha_handling() const { return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -66,9 +66,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 +82,7 @@ private:
        BlurEffect *parent;
        float radius;
        Direction direction;
-       int width, height;
+       int width, height, virtual_width, virtual_height;
 };
 
 #endif // !defined(_BLUR_EFFECT_H)