Install defs.h on make install, since it is needed by effect.h.

[movit] / padding_effect_test.cpp

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index e3f6f41f50e0dc50ef8a7419cc785cc95627f811..f7705883bc5167bb8c74ee5ce9ad2381e274fecf 100644 (file)
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -1,9 +1,14 @@
 // Unit tests for AlphaMultiplicationEffect.
 
-#include "test_util.h"
+#include <stddef.h>
+
+#include "effect_chain.h"
 #include "flat_input.h"
-#include "padding_effect.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "padding_effect.h"
+#include "test_util.h"
+#include "util.h"
 
 TEST(PaddingEffectTest, SimpleCenter) {
        float data[2 * 2] = {
@@ -67,7 +72,7 @@ TEST(PaddingEffectTest, WhiteBorderColor) {
        CHECK(effect->set_float("left", 1.0f));
        CHECK(effect->set_float("top", 1.0f));
 
-       RGBATriplet border_color(1.0f, 1.0f, 1.0f, 1.0f);
+       RGBATuple border_color(1.0f, 1.0f, 1.0f, 1.0f);
        CHECK(effect->set_vec4("border_color", (float *)&border_color));
 
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
@@ -100,7 +105,7 @@ TEST(PaddingEffectTest, BorderColorIsInLinearGamma) {
        CHECK(effect->set_float("left", 0.0f));
        CHECK(effect->set_float("top", 0.0f));
 
-       RGBATriplet border_color(0.2f, 0.4f, 0.6f, 0.8f);  // Same as the pixel in data[].
+       RGBATuple border_color(0.2f, 0.4f, 0.6f, 0.8f);  // Same as the pixel in data[].
        CHECK(effect->set_vec4("border_color", (float *)&border_color));
 
        tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_625, GAMMA_REC_601, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);