Convert a loop to range-based for.

[movit] / ycbcr_422interleaved_input.cpp

diff --git a/ycbcr_422interleaved_input.cpp b/ycbcr_422interleaved_input.cpp
index b6342893b73ffd89e9d1e50aeb423d76c8e32c4a..6546c87bd1217d7de1d221b0dedc9f4abda18ee7 100644 (file)
--- a/ycbcr_422interleaved_input.cpp
+++ b/ycbcr_422interleaved_input.cpp
@@ -21,7 +21,7 @@ YCbCr422InterleavedInput::YCbCr422InterleavedInput(const ImageFormat &image_form
          ycbcr_format(ycbcr_format),
          width(width),
          height(height),
-         resource_pool(NULL)
+         resource_pool(nullptr)
 {
        pbo = 0;
        texture_num[0] = texture_num[1] = 0;
@@ -35,7 +35,10 @@ YCbCr422InterleavedInput::YCbCr422InterleavedInput(const ImageFormat &image_form
        pitches[CHANNEL_LUMA] = width;
        pitches[CHANNEL_CHROMA] = width / ycbcr_format.chroma_subsampling_x;
 
-       pixel_data = NULL;
+       pixel_data = nullptr;
+
+       register_uniform_sampler2d("tex_y", &uniform_tex_y);
+       register_uniform_sampler2d("tex_cbcr", &uniform_tex_cbcr);
 }
 
 YCbCr422InterleavedInput::~YCbCr422InterleavedInput()
@@ -94,8 +97,8 @@ void YCbCr422InterleavedInput::set_gl_state(GLuint glsl_program_num, const strin
        check_error();
 
        // Bind samplers.
-       set_uniform_int(glsl_program_num, prefix, "tex_y", *sampler_num + 0);
-       set_uniform_int(glsl_program_num, prefix, "tex_cbcr", *sampler_num + 1);
+       uniform_tex_y = *sampler_num + 0;
+       uniform_tex_cbcr = *sampler_num + 1;
 
        *sampler_num += 2;
 }