X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=vignette_effect.cpp;h=38bb8785220adbc6f284ebc22b3a5f9146fd100a;hp=0f5c688a3702d7f81efffd1696281851eecd5ce1;hb=2b6a8585772bf9ae742a2ee36144a0cdd5ba0524;hpb=0f37f626e3c445593e2008357622441977fa3a32

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 0f5c688..38bb878 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,9 +1,12 @@
 #include <GL/glew.h>
+#include <assert.h>
 #include <math.h>
 
 #include "effect_util.h"
-#include "vignette_effect.h"
 #include "util.h"
+#include "vignette_effect.h"
+
+using namespace std;
 
 VignetteEffect::VignetteEffect()
 	: center(0.5f, 0.5f),
@@ -16,7 +19,7 @@ VignetteEffect::VignetteEffect()
 	register_float("inner_radius", (float *)&inner_radius);
 }
 
-std::string VignetteEffect::output_fragment_shader()
+string VignetteEffect::output_fragment_shader()
 {
 	return read_file("vignette_effect.frag");
 }
@@ -30,7 +33,7 @@ void VignetteEffect::inform_input_size(unsigned input_num, unsigned width, unsig
 	}
 }
 
-void VignetteEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void VignetteEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);