Fix a bug where PaddingEffect could create assertion errors.

[movit] / flat_input_test.cpp

diff --git a/flat_input_test.cpp b/flat_input_test.cpp
index b717764dda03bb136ff7cb3ece897fa04f3c2f43..c8df483cee4fbcbce121c3ccaa69eac058136f47 100644 (file)
--- a/flat_input_test.cpp
+++ b/flat_input_test.cpp
@@ -1,8 +1,11 @@
 // Unit tests for FlatInput.
 
-#include "test_util.h"
-#include "gtest/gtest.h"
+#include <stddef.h>
+
+#include "effect_chain.h"
 #include "flat_input.h"
+#include "gtest/gtest.h"
+#include "test_util.h"
 
 TEST(FlatInput, SimpleGrayscale) {
        const int size = 4;
@@ -71,7 +74,7 @@ TEST(FlatInput, RGBA) {
        };
        float out_data[4 * size];
 
-       EffectChainTester tester(data, 1, size, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data, 1, size, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        expect_equal(expected_data, out_data, 4, size);
@@ -102,7 +105,7 @@ TEST(FlatInput, AlphaIsNotModifiedBySRGBConversion) {
        float out_data[4 * size];
 
         EffectChainTester tester(NULL, 1, size);
-        tester.add_input(data, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+        tester.add_input(data, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        expect_equal(expected_data, out_data, 4, size);
@@ -152,7 +155,7 @@ TEST(FlatInput, BGRA) {
        };
        float out_data[4 * size];
 
-       EffectChainTester tester(data, 1, size, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data, 1, size, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        expect_equal(expected_data, out_data, 4, size);