Rework PaddingEffect alpha handling, which also fixes a long-standing assertion failure.

[movit] / resize_effect.h

diff --git a/resize_effect.h b/resize_effect.h
index 8fbaba70b08ccfbe5724af7b24068da6b420a75b..77dfdd48e1932c63bdb99110045e8b4263b6a290 100644 (file)
--- a/resize_effect.h
+++ b/resize_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESIZE_EFFECT_H
-#define _RESIZE_EFFECT_H 1
+#ifndef _MOVIT_RESIZE_EFFECT_H
+#define _MOVIT_RESIZE_EFFECT_H 1
 
 // An effect that simply resizes the picture to a given output size
 // (set by the two integer parameters "width" and "height").
@@ -9,6 +9,8 @@
 
 #include "effect.h"
 
+namespace movit {
+
 class ResizeEffect : public Effect {
 public:
        ResizeEffect();
@@ -22,10 +24,13 @@ public:
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        virtual bool changes_output_size() const { return true; }
+       virtual bool sets_virtual_output_size() const { return false; }
        virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const;
 
 private:
        int width, height;
 };
 
-#endif // !defined(_RESIZE_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_RESIZE_EFFECT_H)