Give the alpha enums somewhat better/more consistent names, and shuffle them around...

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 87a0d5e8ce8f3b0a6134366ddf548395497e96f6..24a3fcad90347c545c093884dba809488ea6a317 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -30,10 +30,10 @@ public:
                switch (pixel_format) {
                case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
                case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
-                       return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+                       return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
                case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
                case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
-                       return OUTPUT_ALPHA_POSTMULTIPLIED;
+                       return OUTPUT_POSTMULTIPLIED_ALPHA;
                case FORMAT_RGB:
                case FORMAT_BGR:
                case FORMAT_GRAYSCALE: