Run include-what-you-use over all of movit. Some hand tuning.

[movit] / lift_gamma_gain_effect_test.cpp

diff --git a/lift_gamma_gain_effect_test.cpp b/lift_gamma_gain_effect_test.cpp
index 00c96ca6b33efdcef06e8c000bfe0e422dda22db..0b63063347c582420a8710cf01ea3b4e0e92cdb7 100644 (file)
--- a/lift_gamma_gain_effect_test.cpp
+++ b/lift_gamma_gain_effect_test.cpp
@@ -1,8 +1,10 @@
 // Unit tests for LiftGammaGainEffect.
 
-#include "test_util.h"
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
 #include "lift_gamma_gain_effect.h"
+#include "test_util.h"
 
 TEST(LiftGammaGainEffectTest, DefaultIsNoop) {
        float data[] = {
@@ -14,7 +16,7 @@ TEST(LiftGammaGainEffectTest, DefaultIsNoop) {
        };
 
        float out_data[5 * 4];
-       EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        tester.get_chain()->add_effect(new LiftGammaGainEffect());
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
@@ -39,7 +41,7 @@ TEST(LiftGammaGainEffectTest, Gain) {
        };
 
        float out_data[5 * 4];
-       EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
        ASSERT_TRUE(lgg_effect->set_vec3("gain", gain));
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
@@ -65,7 +67,7 @@ TEST(LiftGammaGainEffectTest, LiftIsDoneInApproximatelysRGB) {
        };
 
        float out_data[5 * 4];
-       EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+       EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
        Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
        ASSERT_TRUE(lgg_effect->set_vec3("lift", lift));
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
@@ -85,7 +87,7 @@ TEST(LiftGammaGainEffectTest, Gamma22IsApproximatelysRGB) {
        float gamma[3] = { 2.2f, 2.2f, 2.2f };
 
        float out_data[5 * 4];
-       EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+       EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
        Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
        ASSERT_TRUE(lgg_effect->set_vec3("gamma", gamma));
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);