Move the GL_UNPACK_ALIGNMENT setting into the texture creation, so that clients won...

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 089008344c3f457468146203b84fbad5a638e527..b37a1ec97d0392568c8f8ca49dfdb3dbde30b82b 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -9,6 +9,8 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
        : image_format(image_format),
           pixel_format(pixel_format),
          type(type),
+         pbo(0),
+         texture_num(0),
          needs_update(false),
          finalized(false),
          output_linear_gamma(false),
@@ -22,6 +24,18 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
        register_int("needs_mipmaps", &needs_mipmaps);
 }
 
+FlatInput::~FlatInput()
+{
+       if (pbo != 0) {
+               glDeleteBuffers(1, &pbo);
+               check_error();
+       }
+       if (texture_num != 0) {
+               glDeleteTextures(1, &texture_num);
+               check_error();
+       }
+}
+
 void FlatInput::finalize()
 {
        // Translate the input format to OpenGL's enums.
@@ -71,6 +85,8 @@ void FlatInput::finalize()
        check_error();
        glBindTexture(GL_TEXTURE_2D, texture_num);
        check_error();
+       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+       check_error();
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
        check_error();
        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);