Merge branch 'master' into epoxy

[movit] / dither_effect_test.cpp

diff --git a/dither_effect_test.cpp b/dither_effect_test.cpp
index 6fd46dbf402feba053183e16790157602dd91277..210a2e721e999047357b212a177863005b9e1fbd 100644 (file)
--- a/dither_effect_test.cpp
+++ b/dither_effect_test.cpp
@@ -1,6 +1,6 @@
 // Unit tests for DitherEffect.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <math.h>
 
 #include "effect_chain.h"
@@ -8,6 +8,8 @@
 #include "image_format.h"
 #include "test_util.h"
 
+namespace movit {
+
 TEST(DitherEffectTest, NoDitherOnExactValues) {
        const int size = 4;
 
@@ -55,3 +57,5 @@ TEST(DitherEffectTest, SinusoidBelowOneLevelComesThrough) {
 
        EXPECT_NEAR(amplitude, sum / (size * 255.0f), 1.1e-5);
 }
+
+}  // namespace movit