X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=40fb7333bcec17fec73683579e7c796925c5afe8;hp=291bb0dcc3a08ce5c9024cd29153883907a0f0eb;hb=ad66f9714e4a36008c341355700272a52484a785;hpb=29072985d0a00a53e5b578a1444cee61a0c9e1f2

diff --git a/flat_input.cpp b/flat_input.cpp
index 291bb0d..40fb733 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <GL/glew.h>
 
+#include "effect_util.h"
 #include "flat_input.h"
 #include "util.h"
 
@@ -17,7 +18,8 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	  needs_mipmaps(false),
 	  width(width),
 	  height(height),
-	  pitch(width)
+	  pitch(width),
+	  pixel_data(NULL)
 {
 	assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
 	register_int("output_linear_gamma", &output_linear_gamma);
@@ -44,7 +46,7 @@ void FlatInput::finalize()
 		internal_format = GL_RGBA16F_ARB;
 	} else if (output_linear_gamma) {
 		assert(type == GL_UNSIGNED_BYTE);
-		internal_format = GL_SRGB8;
+		internal_format = GL_SRGB8_ALPHA8;
 	} else {
 		assert(type == GL_UNSIGNED_BYTE);
 		internal_format = GL_RGBA8;
@@ -52,13 +54,15 @@ void FlatInput::finalize()
 	if (pixel_format == FORMAT_RGB) {
 		format = GL_RGB;
 		bytes_per_pixel = 3;
-	} else if (pixel_format == FORMAT_RGBA) {
+	} else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA ||
+	           pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
 		format = GL_RGBA;
 		bytes_per_pixel = 4;
 	} else if (pixel_format == FORMAT_BGR) {
 		format = GL_BGR;
 		bytes_per_pixel = 3;
-	} else if (pixel_format == FORMAT_BGRA) {
+	} else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
+	           pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
 		format = GL_BGRA;
 		bytes_per_pixel = 4;
 	} else if (pixel_format == FORMAT_GRAYSCALE) {