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

[movit] / padding_effect.cpp

diff --git a/padding_effect.cpp b/padding_effect.cpp
index 2e428c4556d25bbec390fca0ad9a220e7362b86e..3c4919a0c3b1b98a3aa31ebf9aad14ff536bcdcf 100644 (file)
--- a/padding_effect.cpp
+++ b/padding_effect.cpp
@@ -96,13 +96,13 @@ Effect::AlphaHandling PaddingEffect::alpha_handling() const
        if (border_color.r == 0.0 && border_color.g == 0.0 && border_color.b == 0.0) {
                return DONT_CARE_ALPHA_TYPE;
        }
-       return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+       return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
 }
        
-void PaddingEffect::get_output_size(unsigned *width, unsigned *height) const
+void PaddingEffect::get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const
 {
-       *width = output_width;
-       *height = output_height;
+       *virtual_width = *width = output_width;
+       *virtual_height = *height = output_height;
 }
        
 void PaddingEffect::inform_input_size(unsigned input_num, unsigned width, unsigned height)