ColorSpace -> Colorspace. I kept typing it wrong, so even though I usually say color...

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 2447292c90ba9f1ec168055f5350200dc355e64c..ca1661b7868b95c7a7765fe8712f164dade2db9e 100644 (file)
--- 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 1e7bd5b18dabdfa5881a89d7b52d1fa0181785f9..33a04ed451a201d66ada7d97083c2b73a29a3694 100644 (file)
--- 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 34793ab307add94320bb126aa3260f234bac21ba..803773dfd6e4e2f67f8d20562c408df5f5d3aef0 100644 (file)
--- 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 d0ed95b7665b4e36b864bee4ace5508e8f58d68f..dd4dbed8f8bb9b3033d4e55faf0638c5c80c5f50 100644 (file)
--- 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 3bc04a3d84a7b621f4af7b345dde1ad781b8224c..d1654e50a05adae169fea1c9bc7955834625a734 100644 (file)
--- 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 741b83d75954b1d9737f5870260504a6b6980a36..7731b54ad5458db41988f0f1d39e2a8b47ae5802 100644 (file)
--- 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 5df9270f3b09d48c344bda1569b84895d92478ab..778259f7da5ca7961510a9739d9915e491e21698 100644 (file)
--- 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 a315735249dab4ea07ebca3997131db46d2101f0..cf6b0b9264d878b0e90378c00d61cb5369fec741 100644 (file)
--- 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 f84a0f487ff596f0f65bb864b3b1f3b45dc14748..852090ef9231a03eeab0ebfa7def1879708a6cbe 100644 (file)
--- 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 ef94add82a103b8df8041c4a2bb18527e719a0de..db1eae9b7b3fbaf681efc68cac3e8c93731edaf2 100644 (file)
--- 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 cb9263b2fc0f8c680fb3926b061f64e276dcea2a..4fba7bb02fe2a58e94dea62f10cb62474eb9b4cd 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -7,7 +7,7 @@
 
 #include <algorithm>
 
-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 5dac7b2022dafb76d7cf84beaad0acb8a02111f0..c66dfa47a0c2b427261034df0f8ff7c5a716515a 100644 (file)
--- 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 76afc3aa676edc43579d4da21fed51c828de0740..6c33cec9ef4525b0d77e479dc76af7dce2fb8777 100644 (file)
--- 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