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

[movit] / demo.cpp

diff --git a/demo.cpp b/demo.cpp
index 08b858d996070b725083a0d051e11618bfb9ed2f..7b3152889fdc167e9ec938ab2856ae741e75b652 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -151,7 +151,7 @@ void write_png(const char *filename, unsigned char *screenbuf)
 
        png_init_io(png_ptr, fp);
        png_set_rows(png_ptr, info_ptr, row_pointers);
-       png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, png_voidp_NULL);
+       png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, NULL);
        png_destroy_write_struct(&png_ptr, &info_ptr);
        fclose(fp);
 
@@ -162,7 +162,10 @@ int main(int argc, char **argv)
 {
        bool quit = false;
 
-       SDL_Init(SDL_INIT_EVERYTHING);
+       if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
+               fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+               exit(1);
+       }
        SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
@@ -193,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());
-       chain.add_output(inout_format, OUTPUT_ALPHA_POSTMULTIPLIED);
+       chain.add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
        chain.set_dither_bits(8);
        chain.finalize();