Refactor calculate_scaling_weights() so that it is possible to get weights without...

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 1822a3ea6b261fa833d59c4e4e2e0e276b83ca4b..6a96ded56e41334637c667ca480194b7f26433f4 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -44,7 +44,7 @@ struct ScalingWeights {
        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);
+ScalingWeights calculate_bilinear_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
 // A simple manager for support data stored in a 2D texture.
 // Consider moving it to a shared location of more classes
@@ -93,8 +93,8 @@ private:
        
        // 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;
+       std::unique_ptr<SingleResamplePassEffect> hpass_owner, vpass_owner;
+       SingleResamplePassEffect *hpass = nullptr, *vpass = nullptr;
        int input_width, input_height, output_width, output_height;
 
        float offset_x, offset_y;