X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=74585d6d94dae0d3be0ed5fc1da119e8cfc1fc91;hp=fbe5fc506674197d0433c1c4eed4eedbf3ec9e73;hb=9224f01a362117deef6f1140c6802fde256fb168;hpb=fb92a4e217a92ecf83b7812cc6933f6f3048b752

diff --git a/resample_effect.h b/resample_effect.h
index fbe5fc5..74585d6 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1
 
 // High-quality image resizing, either up or down.
 //
@@ -15,8 +15,15 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
+#include <GL/glew.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
+
 #include "effect.h"
 
+class EffectChain;
+class Node;
 class SingleResamplePassEffect;
 
 class ResampleEffect : public Effect {
@@ -62,6 +69,7 @@ public:
 
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
+	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
 		if (parent != NULL) {
@@ -70,9 +78,9 @@ public:
 	}
 	virtual bool changes_output_size() const { return true; }
 
-	virtual void get_output_size(unsigned *width, unsigned *height) const {
-		*width = this->output_width;
-		*height = this->output_height;
+	virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
+		*virtual_width = *width = this->output_width;
+		*virtual_height = *height = this->output_height;
 	}
 
 	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
@@ -87,7 +95,8 @@ private:
 	GLuint texnum;
 	int input_width, input_height, output_width, output_height;
 	int last_input_width, last_input_height, last_output_width, last_output_height;
-	int src_samples;
+	int src_bilinear_samples, num_loops;
+	float slice_height;
 };
 
-#endif // !defined(_RESAMPLE_EFFECT_H)
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)