X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=blur_effect.cpp;h=80aef747c8a6bba0da40f20b0a06e91b810e2937;hb=2b6a8585772bf9ae742a2ee36144a0cdd5ba0524;hp=d62b0568f32b47b8f3c7f30d99db1ee07c4aa195;hpb=2322070a3dbeb6b46b39cca07a0fbf20e95f5468;p=movit

diff --git a/blur_effect.cpp b/blur_effect.cpp
index d62b056..80aef74 100644
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,13 +1,17 @@
-#include <math.h>
-#include <assert.h>
 #include <GL/glew.h>
+#include <assert.h>
+#include <math.h>
+#include <algorithm>
 
 #include "blur_effect.h"
 #include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
+
+using namespace std;
 	
 BlurEffect::BlurEffect()
 	: radius(3.0f),
@@ -54,8 +58,8 @@ void BlurEffect::update_radius()
 	float adjusted_radius = radius;
 	while ((mipmap_width > 1 || mipmap_height > 1) && adjusted_radius * 1.5f > NUM_TAPS / 2) {
 		// Find the next mipmap size (round down, minimum 1 pixel).
-		mipmap_width = std::max(mipmap_width / 2, 1u);
-		mipmap_height = std::max(mipmap_height / 2, 1u);
+		mipmap_width = max(mipmap_width / 2, 1u);
+		mipmap_height = max(mipmap_height / 2, 1u);
 
 		// Approximate when mipmap sizes are odd, but good enough.
 		adjusted_radius = radius * float(mipmap_width) / float(input_width);
@@ -76,7 +80,7 @@ void BlurEffect::update_radius()
 	assert(ok);
 }
 
-bool BlurEffect::set_float(const std::string &key, float value) {
+bool BlurEffect::set_float(const string &key, float value) {
 	if (key == "radius") {
 		radius = value;
 		update_radius();
@@ -100,12 +104,12 @@ SingleBlurPassEffect::SingleBlurPassEffect(BlurEffect *parent)
 	register_int("virtual_height", &virtual_height);
 }
 
-std::string SingleBlurPassEffect::output_fragment_shader()
+string SingleBlurPassEffect::output_fragment_shader()
 {
 	return read_file("blur_effect.frag");
 }
 
-void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);