Move pixel_format out of the ImageFormat struct, since it is only relevant for FlatInput.

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 69c1a6f14d00b2b5a64205133aad3853d23a31eb..9266659596ad8026f7993380c3cf1053a655714f 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -7,7 +7,7 @@
 // comes from a single 2D array with chunky pixels.
 class FlatInput : public Input {
 public:
-       FlatInput(ImageFormat format, unsigned width, unsigned height);
+       FlatInput(ImageFormat format, MovitPixelFormat pixel_format, unsigned width, unsigned height);
 
        // Create the texture itself. We cannot do this in the constructor,
        // because we don't necessarily know all the settings (sRGB texture,
@@ -56,6 +56,7 @@ public:
 
 private:
        ImageFormat image_format;
+       MovitPixelFormat pixel_format;
        GLenum format;
        GLuint pbo, texture_num;
        bool needs_update, finalized;