From d41e82b7cc456c945dbc460b2ffdc13a80f6505f Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 3 Feb 2013 16:04:12 +0100 Subject: [PATCH] Rename RGBATriplet to RGBATuple, to avoid silliness. --- effect.h | 4 ++-- padding_effect.h | 2 +- padding_effect_test.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/effect.h b/effect.h index ecdd95a..9d4f247 100644 --- 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 797db7e..9a32abb 100644 --- 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 f86df3a..f770588 100644 --- 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); -- 2.39.2