X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect.cpp;h=f576baa2d5c3f8cb043a0395cdd3d3314a7bdd90;hp=00d475ac2fb23995780920569ee09203abb91177;hb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1;hpb=5c97329dd35909847e2120b0b368b2723ffe5a44

diff --git a/padding_effect.cpp b/padding_effect.cpp
index 00d475a..f576baa 100644
--- a/padding_effect.cpp
+++ b/padding_effect.cpp
@@ -1,10 +1,14 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 
 #include "effect_util.h"
 #include "padding_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 PaddingEffect::PaddingEffect()
 	: border_color(0.0f, 0.0f, 0.0f, 0.0f),
 	  output_width(1280),
@@ -19,12 +23,12 @@ PaddingEffect::PaddingEffect()
 	register_float("left", &left);
 }
 
-std::string PaddingEffect::output_fragment_shader()
+string PaddingEffect::output_fragment_shader()
 {
 	return read_file("padding_effect.frag");
 }
 
-void PaddingEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void PaddingEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
@@ -128,3 +132,5 @@ void PaddingEffect::inform_input_size(unsigned input_num, unsigned width, unsign
 	input_width = width;
 	input_height = height;
 }
+
+}  // namespace movit