Remove the unused fields from ResampleEffect; if we make any changes here, it will...

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index ceae920aa71c98a0799a8423f173bc9e13c25876..5906a3c44ca41f499b17340e3fcc36fdaec80dfc 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -18,6 +18,7 @@
 #include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
+#include <memory>
 #include <string>
 
 #include "effect.h"
@@ -40,8 +41,8 @@ struct ScalingWeights {
        unsigned dst_samples, num_loops;
 
        // Exactly one of these is set.
-       Tap<fp16_int_t> *bilinear_weights_fp16;
-       Tap<float> *bilinear_weights_fp32;
+       std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
+       std::unique_ptr<Tap<float>[]> bilinear_weights_fp32;
 };
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
@@ -82,12 +83,11 @@ private:
        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);
@@ -102,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);
                }
        }
@@ -132,7 +132,6 @@ 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;