X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=4728fb0805d26f1a7cb1814daf440a944755d7ad;hp=87a0d5e8ce8f3b0a6134366ddf548395497e96f6;hb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/flat_input.h b/flat_input.h
index 87a0d5e..4728fb0 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,10 +1,14 @@
-#ifndef _FLAT_INPUT_H
-#define _FLAT_INPUT_H 1
+#ifndef _MOVIT_FLAT_INPUT_H
+#define _MOVIT_FLAT_INPUT_H 1
 
+#include <GL/glew.h>
 #include <assert.h>
+#include <string>
 
-#include "input.h"
+#include "effect.h"
+#include "image_format.h"
 #include "init.h"
+#include "input.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
@@ -30,10 +34,10 @@ public:
 		switch (pixel_format) {
 		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
-			return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
 		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
-			return OUTPUT_ALPHA_POSTMULTIPLIED;
+			return OUTPUT_POSTMULTIPLIED_ALPHA;
 		case FORMAT_RGB:
 		case FORMAT_BGR:
 		case FORMAT_GRAYSCALE:
@@ -92,4 +96,4 @@ private:
 	const void *pixel_data;
 };
 
-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)