X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=af6a79f0227ced59522e57ced1a865d7b11a9df0;hp=1aa459cbaaa3926c1aeabe2cd8f4647d77fd5f29;hb=6c06dc4215286d0998f50ac4cebfbf0531b5aa19;hpb=b1b5194238dd8b357148a3eee48d8d3a1ad04b35

diff --git a/resample_effect.h b/resample_effect.h
index 1aa459c..af6a79f 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -49,6 +49,7 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
 class ResampleEffect : public Effect {
 public:
 	ResampleEffect();
+	~ResampleEffect();
 
 	virtual std::string effect_type_id() const { return "ResampleEffect"; }
 
@@ -73,17 +74,21 @@ private:
 	void update_size();
 	void update_offset_and_zoom();
 	
+	// Both of these are owned by us if owns_effects is true (before finalize()),
+	// and otherwise owned by the EffectChain.
+	bool owns_effects;
 	SingleResamplePassEffect *hpass, *vpass;
 	int input_width, input_height, output_width, output_height;
 
 	float offset_x, offset_y;
 	float zoom_x, zoom_y;
 	float zoom_center_x, zoom_center_y;
+	float unused;
 };
 
 class SingleResamplePassEffect : public Effect {
 public:
-	// If parent is non-NULL, calls to inform_input_size will be forwarded,
+	// If parent is non-nullptr, calls to inform_input_size will be forwarded,
 	// so that it can inform both passes about the right input and output
 	// resolutions.
 	SingleResamplePassEffect(ResampleEffect *parent);
@@ -98,7 +103,7 @@ public:
 
 	virtual void inform_added(EffectChain *chain) { this->chain = chain; }
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
-		if (parent != NULL) {
+		if (parent != nullptr) {
 			parent->inform_input_size(input_num, width, height);
 		}
 	}
@@ -128,6 +133,7 @@ private:
 
 	int input_width, input_height, output_width, output_height;
 	float offset, zoom;
+	float unused;
 	int last_input_width, last_input_height, last_output_width, last_output_height;
 	float last_offset, last_zoom;
 	int src_bilinear_samples, num_loops;