X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=a8e37e4083dac02a849e9e75a09ee43873d89d05;hp=7538a68c143e8bd29cdac1078b94bd456bf2c9f6;hb=f34b1c36acd27944f00885edfc55363432bfec8e;hpb=1fb55b14a6c694e082f0261e86f26d4f82948821

diff --git a/resample_effect.h b/resample_effect.h
index 7538a68..a8e37e4 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -18,7 +18,6 @@
 #include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
-#include <memory>
 #include <string>
 
 #include "effect.h"
@@ -41,14 +40,15 @@ struct ScalingWeights {
 	unsigned dst_samples, num_loops;
 
 	// Exactly one of these is set.
-	std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
-	std::unique_ptr<Tap<float>[]> bilinear_weights_fp32;
+	Tap<fp16_int_t> *bilinear_weights_fp16;
+	Tap<float> *bilinear_weights_fp32;
 };
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
 class ResampleEffect : public Effect {
 public:
 	ResampleEffect();
+	~ResampleEffect();
 
 	virtual std::string effect_type_id() const { return "ResampleEffect"; }
 
@@ -73,6 +73,9 @@ 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;
 
@@ -84,7 +87,7 @@ private:
 
 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);
@@ -99,7 +102,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);
 		}
 	}