X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=0083f68288c04e48a7f4b88deb1ef6d6da4d0136;hp=08b858d996070b725083a0d051e11618bfb9ed2f;hb=534acae966e3b9dff5501193ce9b863afb7a41da;hpb=27b42af5aa9620979a483075ff424ee943057c9d

diff --git a/demo.cpp b/demo.cpp
index 08b858d..0083f68 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -4,33 +4,37 @@
 #define WIDTH 1280
 #define HEIGHT 720
 
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <sys/time.h>
-#include <assert.h>
-
-#include <string>
-#include <vector>
-#include <map>
-
 #include <GL/glew.h>
-
 #include <SDL/SDL.h>
-#include <SDL/SDL_opengl.h>
+#include <SDL/SDL_error.h>
+#include <SDL/SDL_events.h>
 #include <SDL/SDL_image.h>
+#include <SDL/SDL_keyboard.h>
+#include <SDL/SDL_keysym.h>
+#include <SDL/SDL_mouse.h>
+#include <SDL/SDL_video.h>
+#include <assert.h>
+#include <features.h>
+#include <math.h>
 #include <png.h>
+#include <pngconf.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
 
-#include "init.h"
+#include "diffusion_effect.h"
 #include "effect.h"
 #include "effect_chain.h"
-#include "util.h"
-#include "widgets.h"
-
 #include "flat_input.h"
+#include "image_format.h"
+#include "init.h"
 #include "lift_gamma_gain_effect.h"
 #include "saturation_effect.h"
-#include "diffusion_effect.h"
+#include "util.h"
+#include "widgets.h"
 
 unsigned char result[WIDTH * HEIGHT * 4];
 
@@ -151,7 +155,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 +166,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 +200,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();