Convert a loop to range-based for.

[movit] / deinterlace_effect_test.cpp

diff --git a/deinterlace_effect_test.cpp b/deinterlace_effect_test.cpp
index 0ac19532f7351d1c463cdb5731455e2c8bd43539..a509f8c270ef17d0f5806bcafa1af5999ac8f1d1 100644 (file)
--- a/deinterlace_effect_test.cpp
+++ b/deinterlace_effect_test.cpp
@@ -230,7 +230,7 @@ TestFormat bgra_format = { FORMAT_BGRA_PREMULTIPLIED_ALPHA, GL_BGRA, 4 };
 void BM_DeinterlaceEffect(benchmark::State &state, TestFormat format, bool spatial_interlacing_check, const std::string &shader_type)
 {
        DisableComputeShadersTemporarily disabler(shader_type == "fragment");
 void BM_DeinterlaceEffect(benchmark::State &state, TestFormat format, bool spatial_interlacing_check, const std::string &shader_type)
 {
        DisableComputeShadersTemporarily disabler(shader_type == "fragment");

-       if (disabler.should_skip()) return;
+       if (disabler.should_skip(&state)) return;

 
        unsigned width = state.range(0), height = state.range(1);
        unsigned field_height = height / 2;
 
        unsigned width = state.range(0), height = state.range(1);
        unsigned field_height = height / 2;


@@ -243,11 +243,11 @@ void BM_DeinterlaceEffect(benchmark::State &state, TestFormat format, bool spati
        unique_ptr<float[]> out_data(new float[width * height * format.bytes_per_pixel]);
 
        for (unsigned i = 0; i < width * field_height * format.bytes_per_pixel; ++i) {
        unique_ptr<float[]> out_data(new float[width * height * format.bytes_per_pixel]);
 
        for (unsigned i = 0; i < width * field_height * format.bytes_per_pixel; ++i) {

-               field1[i] = rand();
-               field2[i] = rand();
-               field3[i] = rand();
-               field4[i] = rand();
-               field5[i] = rand();
+               field1[i] = rand() / (RAND_MAX + 1.0);
+               field2[i] = rand() / (RAND_MAX + 1.0);
+               field3[i] = rand() / (RAND_MAX + 1.0);
+               field4[i] = rand() / (RAND_MAX + 1.0);
+               field5[i] = rand() / (RAND_MAX + 1.0);

        }
 
        EffectChainTester tester(nullptr, width, height);
        }
 
        EffectChainTester tester(nullptr, width, height);