Merge branch 'master' into epoxy

[movit] / deconvolution_sharpen_effect.cpp

diff --git a/deconvolution_sharpen_effect.cpp b/deconvolution_sharpen_effect.cpp
index c663d653360350c624bc769047269d69b89827c2..c4ad5cd2cd699b65c223d505dc0fd88932b4e3e1 100644 (file)
--- a/deconvolution_sharpen_effect.cpp
+++ b/deconvolution_sharpen_effect.cpp
@@ -4,7 +4,7 @@
 
 #include <Eigen/Dense>
 #include <Eigen/Cholesky>
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
@@ -19,6 +19,8 @@
 using namespace Eigen;
 using namespace std;
 
+namespace movit {
+
 DeconvolutionSharpenEffect::DeconvolutionSharpenEffect()
        : R(5),
          circle_radius(2.0f),
@@ -444,3 +446,5 @@ void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const str
 
        set_uniform_vec4_array(glsl_program_num, prefix, "samples", samples, (R + 1) * (R + 1));
 }
+
+}  // namespace movit