Merge branch 'master' into epoxy

[movit] / colorspace_conversion_effect.cpp

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index bd4f70eb41d1d0059fab43e591b8132ef48a43f9..2b8a0ca329fd34b3d535fca0cbdfb56584b8ff1d 100644 (file)
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -7,6 +7,9 @@
 #include "util.h"
 
 using namespace Eigen;
+using namespace std;
+
+namespace movit {
 
 // Color coordinates from Rec. 709; sRGB uses the same primaries.
 static const double rec709_x_R = 0.640, rec709_x_G = 0.300, rec709_x_B = 0.150;
@@ -126,7 +129,7 @@ Matrix3d ColorspaceConversionEffect::get_xyz_matrix(Colorspace space)
        return m;
 }
 
-std::string ColorspaceConversionEffect::output_fragment_shader()
+string ColorspaceConversionEffect::output_fragment_shader()
 {
        // Create a matrix to convert from source space -> XYZ,
        // another matrix to convert from XYZ -> destination space,
@@ -141,3 +144,5 @@ std::string ColorspaceConversionEffect::output_fragment_shader()
        return output_glsl_mat3("PREFIX(conversion_matrix)", m) +
                read_file("colorspace_conversion_effect.frag");
 }
+
+}  // namespace movit