Fix a comment.

[movit] / padding_effect.h

diff --git a/padding_effect.h b/padding_effect.h
index 797db7e990eedf867ba17f3377e1a518c6c1de4d..acd555fa3511bd27414e4bf38c9411e49cb384b8 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -11,12 +11,18 @@
 // The border color is taken to be in linear gamma, sRGB, with premultiplied alpha.
 // You may not change it after calling finalize(), since that could change the
 // graph (need_linear_light() etc. depend on the border color you choose).
+//
+// IntegralPaddingEffect is like PaddingEffect, except that "top" and "left" parameters
+// are int parameters instead of float. This allows it to guarantee one-to-one sampling,
+// which can speed up processing by allowing more effect passes to be collapsed.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class PaddingEffect : public Effect {
 public:
        PaddingEffect();
@@ -29,14 +35,26 @@ public:
        virtual AlphaHandling alpha_handling() const;
        
        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;
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
 private:
-       RGBATriplet border_color;
+       RGBATuple border_color;
        int input_width, input_height;
        int output_width, output_height;
        float top, left;
 };
 
+class IntegralPaddingEffect : public PaddingEffect {
+public:
+       IntegralPaddingEffect();
+       virtual std::string effect_type_id() const { return "IntegralPaddingEffect"; }
+       virtual bool one_to_one_sampling() const { return true; }
+       virtual bool set_int(const std::string&, int value);
+       virtual bool set_float(const std::string &key, float value);
+};
+
+}  // namespace movit
+
 #endif // !defined(_MOVIT_PADDING_EFFECT_H)