Merge branch 'master' into epoxy

[movit] / vignette_effect.cpp

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 38bb8785220adbc6f284ebc22b3a5f9146fd100a..d8b4f9bf24d674fc1cf6b815e7e6f07c16e8ff78 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 
@@ -8,6 +8,8 @@
 
 using namespace std;
 
+namespace movit {
+
 VignetteEffect::VignetteEffect()
        : center(0.5f, 0.5f),
          aspect_correction(1.0f, 1.0f),
@@ -43,3 +45,5 @@ void VignetteEffect::set_gl_state(GLuint glsl_program_num, const string &prefix,
        Point2D flipped_center(center.x, 1.0f - center.y);
        set_uniform_vec2(glsl_program_num, prefix, "flipped_center", (float *)&flipped_center);
 }
+
+}  // namespace movit