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

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 4b277b38d8d8eab6b221dd651a52d2889564cec7..f5e27c81b4d07196f6e361f85082db4b620cf1cb 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -9,7 +9,7 @@
 #include "input.h"
 
 class EffectChain;
-class Phase;
+struct Phase;
 
 // For internal use within Node.
 enum AlphaType {
@@ -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 {
-       OUTPUT_ALPHA_PREMULTIPLIED,
-       OUTPUT_ALPHA_POSTMULTIPLIED,
+       OUTPUT_ALPHA_FORMAT_PREMULTIPLIED,
+       OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED,
 };
 
 // A node in the graph; basically an effect and some associated information.
@@ -72,7 +72,7 @@ struct Phase {
        std::vector<Node *> inputs;
 
        std::vector<Node *> effects;  // In order.
-       unsigned output_width, output_height;
+       unsigned output_width, output_height, virtual_output_width, virtual_output_height;
 };
 
 class EffectChain {