From 34509233ba5b71c05f1b85f6fbeadb46719a98f4 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 15 Nov 2017 20:47:31 +0100 Subject: [PATCH] Revert "Remove C++11 dependency from ResampleEffect." Add back unique_ptr, now that we have C++11. This reverts commit 8e9f58fec54a4c879035b214fd7411f6ff7b3a32. --- resample_effect.cpp | 39 ++++++++++++++++----------------------- resample_effect.h | 5 +++-- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/resample_effect.cpp b/resample_effect.cpp index 0a050cf..4598d34 100644 --- a/resample_effect.cpp +++ b/resample_effect.cpp @@ -206,7 +206,7 @@ void normalize_sum(Tap* vals, unsigned num) // // The greedy strategy for combining samples is optimal. template -unsigned combine_many_samples(const Tap *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, Tap **bilinear_weights) +unsigned combine_many_samples(const Tap *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, unique_ptr[]> *bilinear_weights) { float num_subtexels = src_size / movit_texel_subpixel_precision; float inv_num_subtexels = movit_texel_subpixel_precision / src_size; @@ -221,10 +221,9 @@ unsigned combine_many_samples(const Tap *weights, unsigned src_size, unsi // Now that we know the right width, actually combine the samples. unsigned src_bilinear_samples = src_samples - max_samples_saved; - if (*bilinear_weights != nullptr) delete[] *bilinear_weights; - *bilinear_weights = new Tap[dst_samples * src_bilinear_samples]; + bilinear_weights->reset(new Tap[dst_samples * src_bilinear_samples]); for (unsigned y = 0; y < dst_samples; ++y) { - Tap *bilinear_weights_ptr = *bilinear_weights + y * src_bilinear_samples; + Tap *bilinear_weights_ptr = bilinear_weights->get() + y * src_bilinear_samples; unsigned num_samples_saved = combine_samples( weights + y * src_samples, bilinear_weights_ptr, @@ -537,15 +536,15 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str GLenum type, internal_format; void *pixels; - assert((weights.bilinear_weights_fp16 == nullptr) != (weights.bilinear_weights_fp32 == NULL)); + assert((weights.bilinear_weights_fp16 == nullptr) != (weights.bilinear_weights_fp32 == nullptr)); if (weights.bilinear_weights_fp32 != nullptr) { type = GL_FLOAT; internal_format = GL_RG32F; - pixels = weights.bilinear_weights_fp32; + pixels = weights.bilinear_weights_fp32.get(); } else { type = GL_HALF_FLOAT; internal_format = GL_RG16F; - pixels = weights.bilinear_weights_fp16; + pixels = weights.bilinear_weights_fp16.get(); } if (int(weights.src_bilinear_samples) == last_texture_width && @@ -561,9 +560,6 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str last_texture_internal_format = internal_format; } check_error(); - - delete[] weights.bilinear_weights_fp16; - delete[] weights.bilinear_weights_fp32; } ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset) @@ -646,7 +642,7 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f float radius_scaling_factor = min(scaling_factor, 1.0f); int int_radius = lrintf(LANCZOS_RADIUS / radius_scaling_factor); int src_samples = int_radius * 2 + 1; - Tap *weights = new Tap[dst_samples * src_samples]; + unique_ptr[]> weights(new Tap[dst_samples * src_samples]); float subpixel_offset = offset - lrintf(offset); // The part not covered by whole_pixel_offset. assert(subpixel_offset >= -0.5f && subpixel_offset <= 0.5f); for (unsigned y = 0; y < dst_samples; ++y) { @@ -670,14 +666,14 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f // Our tolerance level for total error is a bit higher than the one for invididual // samples, since one would assume overall errors in the shape don't matter as much. const float max_error = 2.0f / (255.0f * 255.0f); - Tap *bilinear_weights_fp16 = nullptr; - int src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp16); - Tap *bilinear_weights_fp32 = nullptr; + unique_ptr[]> bilinear_weights_fp16; + int src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp16); + unique_ptr[]> bilinear_weights_fp32 = nullptr; double max_sum_sq_error_fp16 = 0.0; for (unsigned y = 0; y < dst_samples; ++y) { double sum_sq_error_fp16 = compute_sum_sq_error( - weights + y * src_samples, src_samples, - bilinear_weights_fp16 + y * src_bilinear_samples, src_bilinear_samples, + weights.get() + y * src_samples, src_samples, + bilinear_weights_fp16.get() + y * src_bilinear_samples, src_bilinear_samples, src_size); max_sum_sq_error_fp16 = std::max(max_sum_sq_error_fp16, sum_sq_error_fp16); if (max_sum_sq_error_fp16 > max_error) { @@ -686,19 +682,16 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f } if (max_sum_sq_error_fp16 > max_error) { - delete[] bilinear_weights_fp16; - bilinear_weights_fp16 = nullptr; - src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp32); + bilinear_weights_fp16.reset(); + src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp32); } - delete[] weights; - ScalingWeights ret; ret.src_bilinear_samples = src_bilinear_samples; ret.dst_samples = dst_samples; ret.num_loops = num_loops; - ret.bilinear_weights_fp16 = bilinear_weights_fp16; - ret.bilinear_weights_fp32 = bilinear_weights_fp32; + ret.bilinear_weights_fp16 = move(bilinear_weights_fp16); + ret.bilinear_weights_fp32 = move(bilinear_weights_fp32); return ret; } diff --git a/resample_effect.h b/resample_effect.h index a8e37e4..af6a79f 100644 --- a/resample_effect.h +++ b/resample_effect.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "effect.h" @@ -40,8 +41,8 @@ struct ScalingWeights { unsigned dst_samples, num_loops; // Exactly one of these is set. - Tap *bilinear_weights_fp16; - Tap *bilinear_weights_fp32; + std::unique_ptr[]> bilinear_weights_fp16; + std::unique_ptr[]> bilinear_weights_fp32; }; ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset); -- 2.39.2