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

[movit] / test_util.h

diff --git a/test_util.h b/test_util.h
index 407824d5441ddc34e4770ff54cf95e09eda28a00..9a7d0012ff5c0cb77c2ec3277ad35c9dab3103a5 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -15,11 +15,11 @@ 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);
-       void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);
-       void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);
+       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);
+       void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
 
        EffectChain chain;
        GLuint fbo, texnum;