Merge branch 'master' into epoxy

[movit] / alpha_multiplication_effect_test.cpp

diff --git a/alpha_multiplication_effect_test.cpp b/alpha_multiplication_effect_test.cpp
index eab4b25e737955aeeadcff94858177ac856ea417..2aa9b6d98949d49dc9b554071e8474583e381487 100644 (file)
--- a/alpha_multiplication_effect_test.cpp
+++ b/alpha_multiplication_effect_test.cpp
@@ -1,7 +1,13 @@
 // Unit tests for AlphaMultiplicationEffect.
 
-#include "test_util.h"
+#include <epoxy/gl.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "test_util.h"
+
+namespace movit {
 
 TEST(AlphaMultiplicationEffectTest, SimpleTest) {
        const int size = 3;
@@ -17,7 +23,9 @@ TEST(AlphaMultiplicationEffectTest, SimpleTest) {
        };
        float out_data[4 * size];
        EffectChainTester tester(data, 1, size, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
-       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 
        expect_equal(expected_data, out_data, 4, size);
 }
+
+}  // namespace movit