From 1ca4785183b5af9a2a255bba0a28dfdae156470a Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 14 Oct 2012 12:48:03 +0200 Subject: [PATCH 1/1] ColorSpace -> Colorspace. I kept typing it wrong, so even though I usually say color space, it is seemingly the best choice. :-) --- colorspace_conversion_effect.cpp | 6 +++--- colorspace_conversion_effect.h | 8 ++++---- colorspace_conversion_effect_test.cpp | 12 ++++++------ effect.h | 2 +- effect_chain.cpp | 8 ++++---- effect_chain.h | 2 +- effect_chain_test.cpp | 4 ++-- flat_input.h | 2 +- image_format.h | 4 ++-- input.h | 2 +- test_util.cpp | 6 +++--- test_util.h | 6 +++--- ycbcr_input.h | 2 +- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp index 2447292..ca1661b 100644 --- a/colorspace_conversion_effect.cpp +++ b/colorspace_conversion_effect.cpp @@ -16,7 +16,7 @@ double rec601_625_y_R = 0.330, rec601_625_y_G = 0.600, rec601_625_y_B = 0.060; // The D65 white point. Given in both Rec. 601 and 709. double d65_x = 0.3127, d65_y = 0.3290; -ColorSpaceConversionEffect::ColorSpaceConversionEffect() +ColorspaceConversionEffect::ColorspaceConversionEffect() : source_space(COLORSPACE_sRGB), destination_space(COLORSPACE_sRGB) { @@ -24,7 +24,7 @@ ColorSpaceConversionEffect::ColorSpaceConversionEffect() register_int("destination_space", (int *)&destination_space); } -void get_xyz_matrix(ColorSpace space, Matrix3x3 m) +void get_xyz_matrix(Colorspace space, Matrix3x3 m) { if (space == COLORSPACE_XYZ) { m[0] = 1.0f; m[3] = 0.0f; m[6] = 0.0f; @@ -121,7 +121,7 @@ void get_xyz_matrix(ColorSpace space, Matrix3x3 m) m[2] = Z_R; m[5] = Z_G; m[8] = Z_B; } -std::string ColorSpaceConversionEffect::output_fragment_shader() +std::string ColorspaceConversionEffect::output_fragment_shader() { // Create a matrix to convert from source space -> XYZ, // another matrix to convert from XYZ -> destination space, diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h index 1e7bd5b..33a04ed 100644 --- a/colorspace_conversion_effect.h +++ b/colorspace_conversion_effect.h @@ -11,16 +11,16 @@ #include "effect.h" #include "effect_chain.h" -class ColorSpaceConversionEffect : public Effect { +class ColorspaceConversionEffect : public Effect { public: - ColorSpaceConversionEffect(); - virtual std::string effect_type_id() const { return "ColorSpaceConversionEffect"; } + ColorspaceConversionEffect(); + virtual std::string effect_type_id() const { return "ColorspaceConversionEffect"; } std::string output_fragment_shader(); virtual bool needs_srgb_primaries() const { return false; } private: - ColorSpace source_space, destination_space; + Colorspace source_space, destination_space; }; #endif // !defined(_COLORSPACE_CONVERSION_EFFECT_H) diff --git a/colorspace_conversion_effect_test.cpp b/colorspace_conversion_effect_test.cpp index 34793ab..803773d 100644 --- a/colorspace_conversion_effect_test.cpp +++ b/colorspace_conversion_effect_test.cpp @@ -1,10 +1,10 @@ -// Unit tests for ColorSpaceConversionEffect. +// Unit tests for ColorspaceConversionEffect. #include "test_util.h" #include "gtest/gtest.h" #include "colorspace_conversion_effect.h" -TEST(ColorSpaceConversionEffectTest, Reversible) { +TEST(ColorspaceConversionEffectTest, Reversible) { float data[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, @@ -27,7 +27,7 @@ TEST(ColorSpaceConversionEffectTest, Reversible) { expect_equal(data, out_data, 4, 6); } -TEST(ColorSpaceConversionEffectTest, sRGB_Primaries) { +TEST(ColorspaceConversionEffectTest, sRGB_Primaries) { float data[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, @@ -85,7 +85,7 @@ TEST(ColorSpaceConversionEffectTest, sRGB_Primaries) { EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]); } -TEST(ColorSpaceConversionEffectTest, Rec601_525_Primaries) { +TEST(ColorspaceConversionEffectTest, Rec601_525_Primaries) { float data[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, @@ -135,7 +135,7 @@ TEST(ColorSpaceConversionEffectTest, Rec601_525_Primaries) { EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]); } -TEST(ColorSpaceConversionEffectTest, Rec601_625_Primaries) { +TEST(ColorspaceConversionEffectTest, Rec601_625_Primaries) { float data[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, @@ -185,7 +185,7 @@ TEST(ColorSpaceConversionEffectTest, Rec601_625_Primaries) { EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]); } -TEST(ColorSpaceConversionEffectTest, sRGBToRec601_525) { +TEST(ColorspaceConversionEffectTest, sRGBToRec601_525) { float data[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, diff --git a/effect.h b/effect.h index d0ed95b..dd4dbed 100644 --- a/effect.h +++ b/effect.h @@ -53,7 +53,7 @@ public: virtual ~Effect() {} // An identifier for this type of effect, mostly used for debug output - // (but some special names, like "ColorSpaceConversionEffect", holds special + // (but some special names, like "ColorspaceConversionEffect", holds special // meaning). Same as the class name is fine. virtual std::string effect_type_id() const = 0; diff --git a/effect_chain.cpp b/effect_chain.cpp index 3bc04a3..d1654e5 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -658,7 +658,7 @@ void EffectChain::propagate_gamma_and_color_space() continue; } - ColorSpace color_space = node->incoming_links[0]->output_color_space; + Colorspace color_space = node->incoming_links[0]->output_color_space; GammaCurve gamma_curve = node->incoming_links[0]->output_gamma_curve; for (unsigned j = 1; j < node->incoming_links.size(); ++j) { if (node->incoming_links[j]->output_color_space != color_space) { @@ -671,7 +671,7 @@ void EffectChain::propagate_gamma_and_color_space() // The conversion effects already have their outputs set correctly, // so leave them alone. - if (node->effect->effect_type_id() != "ColorSpaceConversionEffect") { + if (node->effect->effect_type_id() != "ColorspaceConversionEffect") { node->output_color_space = color_space; } if (node->effect->effect_type_id() != "GammaCompressionEffect" && @@ -725,7 +725,7 @@ void EffectChain::fix_internal_color_spaces() if (input->output_color_space == COLORSPACE_sRGB) { continue; } - Node *conversion = add_node(new ColorSpaceConversionEffect()); + Node *conversion = add_node(new ColorspaceConversionEffect()); conversion->effect->set_int("source_space", input->output_color_space); conversion->effect->set_int("destination_space", COLORSPACE_sRGB); conversion->output_color_space = COLORSPACE_sRGB; @@ -759,7 +759,7 @@ void EffectChain::fix_output_color_space() { Node *output = find_output_node(); if (output->output_color_space != output_format.color_space) { - Node *conversion = add_node(new ColorSpaceConversionEffect()); + Node *conversion = add_node(new ColorspaceConversionEffect()); conversion->effect->set_int("source_space", output->output_color_space); conversion->effect->set_int("destination_space", output_format.color_space); conversion->output_color_space = output_format.color_space; diff --git a/effect_chain.h b/effect_chain.h index 741b83d..7731b54 100644 --- a/effect_chain.h +++ b/effect_chain.h @@ -40,7 +40,7 @@ private: Phase *phase; // Used during the building of the effect chain. - ColorSpace output_color_space; + Colorspace output_color_space; GammaCurve output_gamma_curve; friend class EffectChain; diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp index 5df9270..778259f 100644 --- a/effect_chain_test.cpp +++ b/effect_chain_test.cpp @@ -153,8 +153,8 @@ TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) { Node *node = effect->invert_node; ASSERT_EQ(1, node->incoming_links.size()); ASSERT_EQ(1, node->outgoing_links.size()); - EXPECT_EQ("ColorSpaceConversionEffect", node->incoming_links[0]->effect->effect_type_id()); - EXPECT_EQ("ColorSpaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id()); + EXPECT_EQ("ColorspaceConversionEffect", node->incoming_links[0]->effect->effect_type_id()); + EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id()); expect_equal(expected_data, out_data, 3, 2); } diff --git a/flat_input.h b/flat_input.h index a315735..cf6b0b9 100644 --- a/flat_input.h +++ b/flat_input.h @@ -31,7 +31,7 @@ public: unsigned get_width() const { return width; } unsigned get_height() const { return height; } - ColorSpace get_color_space() const { return image_format.color_space; } + Colorspace get_color_space() const { return image_format.color_space; } GammaCurve get_gamma_curve() const { return image_format.gamma_curve; } // Tells the input where to fetch the actual pixel data. Note that if you change diff --git a/image_format.h b/image_format.h index f84a0f4..852090e 100644 --- a/image_format.h +++ b/image_format.h @@ -3,7 +3,7 @@ enum MovitPixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA, FORMAT_GRAYSCALE }; -enum ColorSpace { +enum Colorspace { COLORSPACE_INVALID = -1, // For internal use. COLORSPACE_sRGB = 0, COLORSPACE_REC_709 = 0, // Same as sRGB. @@ -26,7 +26,7 @@ enum YCbCrLumaCoefficients { }; struct ImageFormat { - ColorSpace color_space; + Colorspace color_space; GammaCurve gamma_curve; }; diff --git a/input.h b/input.h index ef94add..db1eae9 100644 --- a/input.h +++ b/input.h @@ -31,7 +31,7 @@ public: virtual unsigned get_width() const = 0; virtual unsigned get_height() const = 0; - virtual ColorSpace get_color_space() const = 0; + virtual Colorspace get_color_space() const = 0; virtual GammaCurve get_gamma_curve() const = 0; }; diff --git a/test_util.cpp b/test_util.cpp index cb9263b..4fba7bb 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -7,7 +7,7 @@ #include -EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve) +EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve) : chain(width, height), width(width), height(height) { add_input(data, pixel_format, color_space, gamma_curve); @@ -42,7 +42,7 @@ EffectChainTester::~EffectChainTester() check_error(); } -Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve) +Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve) { ImageFormat format; format.color_space = color_space; @@ -54,7 +54,7 @@ Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_fo return input; } -void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve) +void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve) { ImageFormat image_format; image_format.color_space = color_space; diff --git a/test_util.h b/test_util.h index 5dac7b2..c66dfa4 100644 --- a/test_util.h +++ b/test_util.h @@ -5,12 +5,12 @@ class EffectChainTester { public: - EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve); + EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve); ~EffectChainTester(); EffectChain *get_chain() { return &chain; } - Input *add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve); - void run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve); + Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve); + void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve); private: EffectChain chain; diff --git a/ycbcr_input.h b/ycbcr_input.h index 76afc3a..6c33cec 100644 --- a/ycbcr_input.h +++ b/ycbcr_input.h @@ -48,7 +48,7 @@ public: unsigned get_width() const { return width; } unsigned get_height() const { return height; } - ColorSpace get_color_space() const { return image_format.color_space; } + Colorspace get_color_space() const { return image_format.color_space; } GammaCurve get_gamma_curve() const { return image_format.gamma_curve; } // Tells the input where to fetch the actual pixel data. Note that if you change -- 2.39.2