Fix typo in luma_mix shader.

[movit] / white_balance_effect.cpp

diff --git a/white_balance_effect.cpp b/white_balance_effect.cpp
index 2c99ca85c0b791379bd9e564ce2770df467e4664..0aa85da66f0159ca7bfd94e8b7ff1e132c73746a 100644 (file)
--- a/white_balance_effect.cpp
+++ b/white_balance_effect.cpp
@@ -6,10 +6,14 @@
 #include "colorspace_conversion_effect.h"
 #include "d65.h"
 #include "effect_util.h"
+#include "image_format.h"
 #include "util.h"
 #include "white_balance_effect.h"
 
 using namespace Eigen;
+using namespace std;
+
+namespace movit {
 
 namespace {
 
@@ -103,12 +107,12 @@ WhiteBalanceEffect::WhiteBalanceEffect()
        register_float("output_color_temperature", &output_color_temperature);
 }
 
-std::string WhiteBalanceEffect::output_fragment_shader()
+string WhiteBalanceEffect::output_fragment_shader()
 {
        return read_file("white_balance_effect.frag");
 }
 
-void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
        Matrix3d rgb_to_xyz_matrix = ColorspaceConversionEffect::get_xyz_matrix(COLORSPACE_sRGB);
        Vector3d rgb(neutral_color.r, neutral_color.g, neutral_color.b);
@@ -146,3 +150,5 @@ void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const std::string
                rgb_to_xyz_matrix;
        set_uniform_mat3(glsl_program_num, prefix, "correction_matrix", corr_matrix);
 }
+
+}  // namespace movit