Rescale resampling weights so that the sum becomes one.

[movit] / gamma_compression_effect.cpp

diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp
index b1a16a6f33af1523dcbcd81eaccb77d31f583b0f..a90d67a4d4a65c7e999df72042d99a74f2d20c22 100644 (file)
--- a/gamma_compression_effect.cpp
+++ b/gamma_compression_effect.cpp
@@ -1,18 +1,18 @@
-#include <math.h>
-#include <string.h>
 #include <assert.h>
 
-#include "gamma_compression_effect.h"
 #include "effect_util.h"
+#include "gamma_compression_effect.h"
 #include "util.h"
 
+using namespace std;
+
 GammaCompressionEffect::GammaCompressionEffect()
        : destination_curve(GAMMA_LINEAR)
 {
        register_int("destination_curve", (int *)&destination_curve);
 }
 
-std::string GammaCompressionEffect::output_fragment_shader()
+string GammaCompressionEffect::output_fragment_shader()
 {
        if (destination_curve == GAMMA_LINEAR) {
                return read_file("identity.frag");
@@ -25,7 +25,7 @@ std::string GammaCompressionEffect::output_fragment_shader()
        assert(false);
 }
 
-void GammaCompressionEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void GammaCompressionEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);