Fix a bug when scaling and doing offset at the same time. (At least one more remains.)

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 74585d6d94dae0d3be0ed5fc1da119e8cfc1fc91..c52a973c18b055c2927896f9e585ea3de9bfa4d7 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -15,13 +15,15 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class EffectChain;
 class Node;
 class SingleResamplePassEffect;
@@ -71,6 +73,7 @@ public:
        virtual bool needs_srgb_primaries() const { return false; }
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
+       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {
                        parent->inform_input_size(input_num, width, height);
@@ -91,12 +94,17 @@ private:
        void update_texture(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
        ResampleEffect *parent;
+       EffectChain *chain;
        Direction direction;
        GLuint texnum;
        int input_width, input_height, output_width, output_height;
+       float offset;
        int last_input_width, last_input_height, last_output_width, last_output_height;
+       float last_offset;
        int src_bilinear_samples, num_loops;
        float slice_height;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)