Convert a loop to range-based for.

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 8f24d86f9347b408b8edb2a9f24c677155b35591..6e3db34cfceb1e772566f10f5e3ab82cbe675a68 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -22,7 +22,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format_in,
          height(height),
          pitch(width),
          owns_texture(false),
-         pixel_data(NULL),
+         pixel_data(nullptr),
          fixup_swap_rb(false),
          fixup_red_to_grayscale(false)
 {
@@ -66,7 +66,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();
 
-       if (texture_num == 0 && (pbo != 0 || pixel_data != NULL)) {
+       if (texture_num == 0 && (pbo != 0 || pixel_data != nullptr)) {
                // Translate the input format to OpenGL's enums.
                GLint internal_format;
                GLenum format;
@@ -166,6 +166,8 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
        } else {
                glBindTexture(GL_TEXTURE_2D, texture_num);
                check_error();
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
+               check_error();
        }
 
        // Bind it to a sampler.