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

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 1820eafda24c56248fcaa80b3af73caa7172d507..a315735249dab4ea07ebca3997131db46d2101f0 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -8,6 +8,7 @@
 class FlatInput : public Input {
 public:
        FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+       ~FlatInput();
 
        virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -18,8 +19,9 @@ public:
 
        // TODO: Check that we actually have the required extension.
        virtual bool can_output_linear_gamma() const {
-               return (image_format.gamma_curve == GAMMA_LINEAR ||
-                       image_format.gamma_curve == GAMMA_sRGB);
+               return (type == GL_UNSIGNED_BYTE &&
+                       (image_format.gamma_curve == GAMMA_LINEAR ||
+                        image_format.gamma_curve == GAMMA_sRGB));
        }
 
        std::string output_fragment_shader();