Rename the OutputAlphaFormat enums; they had gotten inconsistent after the last alpha...

diff --git a/alpha_multiplication_effect_test.cpp b/alpha_multiplication_effect_test.cpp
index eab4b25e737955aeeadcff94858177ac856ea417..6ee428970bded340f5039d5e657b3fdc756e4d52 100644 (file)
--- a/alpha_multiplication_effect_test.cpp
+++ b/alpha_multiplication_effect_test.cpp
@@ -17,7 +17,7 @@ TEST(AlphaMultiplicationEffectTest, SimpleTest) {
        };
        float out_data[4 * size];
        EffectChainTester tester(data, 1, size, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        };
        float out_data[4 * size];
        EffectChainTester tester(data, 1, size, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);

-       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

 
        expect_equal(expected_data, out_data, 4, size);
 }
 
        expect_equal(expected_data, out_data, 4, size);
 }

diff --git a/demo.cpp b/demo.cpp
index 298b5361ff1f8aaba212273e8720ab51cbfe2924..7b3152889fdc167e9ec938ab2856ae741e75b652 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
        //Effect *sandbox_effect = chain.add_effect(new SandboxEffect());
        //sandbox_effect->set_float("parm", 42.0f);
        //chain.add_effect(new MirrorEffect());
        //Effect *sandbox_effect = chain.add_effect(new SandboxEffect());
        //sandbox_effect->set_float("parm", 42.0f);
        //chain.add_effect(new MirrorEffect());

-       chain.add_output(inout_format, OUTPUT_POSTMULTIPLIED_ALPHA);
+       chain.add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);

        chain.set_dither_bits(8);
        chain.finalize();
 
        chain.set_dither_bits(8);
        chain.finalize();
 

diff --git a/effect_chain.cpp b/effect_chain.cpp
index c04e34d517833384f90266ac7b80004f71c22f6e..bd039b0113e662a9279976a3d01ed43e2a406102 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1141,14 +1141,14 @@ void EffectChain::fix_output_alpha()
                return;
        }
        if (output->output_alpha_type == ALPHA_PREMULTIPLIED &&
                return;
        }
        if (output->output_alpha_type == ALPHA_PREMULTIPLIED &&

-           output_alpha_format == OUTPUT_POSTMULTIPLIED_ALPHA) {
+           output_alpha_format == OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED) {

                Node *conversion = add_node(new AlphaDivisionEffect());
                connect_nodes(output, conversion);
                propagate_alpha();
                propagate_gamma_and_color_space();
        }
        if (output->output_alpha_type == ALPHA_POSTMULTIPLIED &&
                Node *conversion = add_node(new AlphaDivisionEffect());
                connect_nodes(output, conversion);
                propagate_alpha();
                propagate_gamma_and_color_space();
        }
        if (output->output_alpha_type == ALPHA_POSTMULTIPLIED &&

-           output_alpha_format == OUTPUT_ALPHA_PREMULTIPLIED) {
+           output_alpha_format == OUTPUT_ALPHA_FORMAT_PREMULTIPLIED) {

                Node *conversion = add_node(new AlphaMultiplicationEffect());
                connect_nodes(output, conversion);
                propagate_alpha();
                Node *conversion = add_node(new AlphaMultiplicationEffect());
                connect_nodes(output, conversion);
                propagate_alpha();

diff --git a/effect_chain.h b/effect_chain.h
index f5064eb7b53bb8bfd8ea51919b33a4d9385649d4..f5e27c81b4d07196f6e361f85082db4b620cf1cb 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -22,8 +22,8 @@ enum AlphaType {
 // Whether you want pre- or postmultiplied alpha in the output
 // (see effect.h for a discussion of pre- versus postmultiplied alpha).
 enum OutputAlphaFormat {
 // Whether you want pre- or postmultiplied alpha in the output
 // (see effect.h for a discussion of pre- versus postmultiplied alpha).
 enum OutputAlphaFormat {

-       OUTPUT_ALPHA_PREMULTIPLIED,
-       OUTPUT_POSTMULTIPLIED_ALPHA,
+       OUTPUT_ALPHA_FORMAT_PREMULTIPLIED,
+       OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED,

 };
 
 // A node in the graph; basically an effect and some associated information.
 };
 
 // A node in the graph; basically an effect and some associated information.

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 5fa81d3e559ce3fb51b67c59944a0f3a1e129e5b..e7f25e53861045ac8b0b49581ed91c173709b6b6 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -439,7 +439,7 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlpha) {
        EffectChainTester tester(NULL, size, 1);
        RewritingToBlueInput *input = new RewritingToBlueInput();
        tester.get_chain()->add_input(input);
        EffectChainTester tester(NULL, size, 1);
        RewritingToBlueInput *input = new RewritingToBlueInput();
        tester.get_chain()->add_input(input);

-       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

 
        Node *node = input->blue_node;
        EXPECT_EQ(0, node->incoming_links.size());
 
        Node *node = input->blue_node;
        EXPECT_EQ(0, node->incoming_links.size());

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index 1d2be797eb93a38bfb59fd13b8b6716cd56a703d..e3f6f41f50e0dc50ef8a7419cc785cc95627f811 100644 (file)
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -34,7 +34,7 @@ TEST(PaddingEffectTest, SimpleCenter) {
        CHECK(effect->set_float("left", 1.0f));
        CHECK(effect->set_float("top", 1.0f));
 
        CHECK(effect->set_float("left", 1.0f));
        CHECK(effect->set_float("top", 1.0f));
 

-       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

        expect_equal(expected_data, out_data, 4, 4);
 }
 
        expect_equal(expected_data, out_data, 4, 4);
 }
 


@@ -70,7 +70,7 @@ TEST(PaddingEffectTest, WhiteBorderColor) {
        RGBATriplet border_color(1.0f, 1.0f, 1.0f, 1.0f);
        CHECK(effect->set_vec4("border_color", (float *)&border_color));
 
        RGBATriplet 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_PREMULTIPLIED);
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

        expect_equal(expected_data, out_data, 4, 4);
 }
 
        expect_equal(expected_data, out_data, 4, 4);
 }
 


@@ -103,7 +103,7 @@ TEST(PaddingEffectTest, BorderColorIsInLinearGamma) {
        RGBATriplet 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));
 
        RGBATriplet 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_POSTMULTIPLIED_ALPHA);
+       tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_625, GAMMA_REC_601, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);

        expect_equal(expected_data, out_data, 4, 2);
 }
 
        expect_equal(expected_data, out_data, 4, 2);
 }
 


@@ -134,7 +134,7 @@ TEST(PaddingEffectTest, DifferentXAndYOffset) {
        CHECK(effect->set_float("left", 2.0f));
        CHECK(effect->set_float("top", 1.0f));
 
        CHECK(effect->set_float("left", 2.0f));
        CHECK(effect->set_float("top", 1.0f));
 

-       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

        expect_equal(expected_data, out_data, 3, 3);
 }
 
        expect_equal(expected_data, out_data, 3, 3);
 }
 


@@ -166,7 +166,7 @@ TEST(PaddingEffectTest, NonIntegerOffset) {
        CHECK(effect->set_float("left", 0.25f));
        CHECK(effect->set_float("top", 0.0f));
 
        CHECK(effect->set_float("left", 0.25f));
        CHECK(effect->set_float("top", 0.0f));
 

-       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

        expect_equal(expected_data, out_data, 5, 2);
 }
 
        expect_equal(expected_data, out_data, 5, 2);
 }
 


@@ -196,6 +196,6 @@ TEST(PaddingEffectTest, Crop) {
        CHECK(effect->set_float("left", -1.0f));
        CHECK(effect->set_float("top", -1.0f));
 
        CHECK(effect->set_float("left", -1.0f));
        CHECK(effect->set_float("top", -1.0f));
 

-       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);

        expect_equal(expected_data, out_data, 1, 1);
 }
        expect_equal(expected_data, out_data, 1, 1);
 }

diff --git a/test_util.h b/test_util.h
index eca6b6a83f65eaa32112e0a577a736f2d3ec8865..9a7d0012ff5c0cb77c2ec3277ad35c9dab3103a5 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -15,8 +15,8 @@ public:
        EffectChain *get_chain() { return &chain; }
        Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        EffectChain *get_chain() { return &chain; }
        Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);

-       void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_POSTMULTIPLIED_ALPHA);
-       void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_POSTMULTIPLIED_ALPHA);
+       void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
+       void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);

 
 private:
        void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
 
 private:
        void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);