X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=70cc10984cc2b2397f4ee109853cdf5bc0ccfc08;hp=0a8139224c2feb037fa177fa31f32dfcbcde627c;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=358df88f77e4f8ae2ead71a06dc36bf5402d9b5d

diff --git a/flat_input.cpp b/flat_input.cpp
index 0a81392..70cc109 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -7,6 +7,8 @@
 #include "resource_pool.h"
 #include "util.h"
 
+using namespace std;
+
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
 	: image_format(image_format),
           pixel_format(pixel_format),
@@ -64,7 +66,7 @@ void FlatInput::finalize()
 	finalized = true;
 }
 	
-void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
 	glActiveTexture(GL_TEXTURE0 + *sampler_num);
 	check_error();
@@ -108,7 +110,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 	++*sampler_num;
 }
 
-std::string FlatInput::output_fragment_shader()
+string FlatInput::output_fragment_shader()
 {
 	return read_file("flat_input.frag");
 }