Rename RGBATriplet to RGBATuple, to avoid silliness.

diff --git a/effect.h b/effect.h
index ecdd95a455320ed9625e170752b39967a1495c4c..9d4f247632449cbb2cccaf44000d75343b4b147c 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -38,8 +38,8 @@ struct RGBTriplet {
 };
 
 // Can alias on a float[4].
-struct RGBATriplet {
-       RGBATriplet(float r, float g, float b, float a)
+struct RGBATuple {
+       RGBATuple(float r, float g, float b, float a)
                : r(r), g(g), b(b), a(a) {}
 
        float r, g, b, a;

diff --git a/padding_effect.h b/padding_effect.h
index 797db7e990eedf867ba17f3377e1a518c6c1de4d..9a32abbe41c343661abdef7bfa9d0e289a48d85e 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -33,7 +33,7 @@ public:
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
 private:
-       RGBATriplet border_color;
+       RGBATuple border_color;
        int input_width, input_height;
        int output_width, output_height;
        float top, left;

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index f86df3aff4d7f178e01eb636b442982e4157480f..f7705883bc5167bb8c74ee5ce9ad2381e274fecf 100644 (file)
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -72,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);
@@ -105,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);