Add resample_effect_test to .gitignore.

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 39419b1954fe5125fdd43386ca360a691c3f25f4..8b5a3ce4c07d004368063634014b9c88087cd3fc 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -2,12 +2,14 @@
 #define _FLAT_INPUT_H 1
 
 #include "input.h"
+#include "init.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
 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"; }
 
@@ -16,9 +18,9 @@ public:
        // mipmap generation) at that point.
        void finalize();
 
-       // TODO: Check that we actually have the required extension.
        virtual bool can_output_linear_gamma() const {
-               return (type == GL_UNSIGNED_BYTE &&
+               return (movit_srgb_textures_supported &&
+                       type == GL_UNSIGNED_BYTE &&
                        (image_format.gamma_curve == GAMMA_LINEAR ||
                         image_format.gamma_curve == GAMMA_sRGB));
        }
@@ -30,7 +32,7 @@ public:
 
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
-       ColorSpace get_color_space() const { return image_format.color_space; }
+       Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change