X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=deconvolution_sharpen_effect.cpp;h=0a13dd642f3d9a3cb5d00ac857f2763cf4904ee5;hp=38cf0cf3fcbc66bf6f8b9a5e64e65972da977fab;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=9bfa15dcbddfdeaaba490879362f74d75982ee2f

diff --git a/deconvolution_sharpen_effect.cpp b/deconvolution_sharpen_effect.cpp
index 38cf0cf..0a13dd6 100644
--- a/deconvolution_sharpen_effect.cpp
+++ b/deconvolution_sharpen_effect.cpp
@@ -2,17 +2,22 @@
 // Since all of our signals are symmetrical, discrete correlation and convolution
 // is the same operation, and so we won't make a difference in notation.
 
-
-#include <math.h>
-#include <assert.h>
 #include <Eigen/Dense>
 #include <Eigen/Cholesky>
+#include <GL/glew.h>
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <algorithm>
+#include <new>
 
 #include "deconvolution_sharpen_effect.h"
+#include "effect_util.h"
 #include "util.h"
-#include "opengl.h"
 
 using namespace Eigen;
+using namespace std;
 
 DeconvolutionSharpenEffect::DeconvolutionSharpenEffect()
 	: R(5),
@@ -33,7 +38,7 @@ DeconvolutionSharpenEffect::DeconvolutionSharpenEffect()
 	register_float("noise", &noise);
 }
 
-std::string DeconvolutionSharpenEffect::output_fragment_shader()
+string DeconvolutionSharpenEffect::output_fragment_shader()
 {
 	char buf[256];
 	sprintf(buf, "#define R %u\n", R);
@@ -166,10 +171,10 @@ MatrixXf convolve(const MatrixXf &a, const MatrixXf &b)
 			int xa_max = xr;
 
 			// Now fit to the first demand.
-			ya_min = std::max<int>(ya_min, 0);
-			ya_max = std::min<int>(ya_max, a.rows() - 1);
-			xa_min = std::max<int>(xa_min, 0);
-			xa_max = std::min<int>(xa_max, a.cols() - 1);
+			ya_min = max<int>(ya_min, 0);
+			ya_max = min<int>(ya_max, a.rows() - 1);
+			xa_min = max<int>(xa_min, 0);
+			xa_max = min<int>(xa_max, a.cols() - 1);
 
 			assert(ya_max >= ya_min);
 			assert(xa_max >= xa_min);
@@ -216,10 +221,10 @@ MatrixXf central_convolve(const MatrixXf &a, const MatrixXf &b)
 			int xa_max = xr;
 
 			// Now fit to the first demand.
-			ya_min = std::max<int>(ya_min, 0);
-			ya_max = std::min<int>(ya_max, a.rows() - 1);
-			xa_min = std::max<int>(xa_min, 0);
-			xa_max = std::min<int>(xa_max, a.cols() - 1);
+			ya_min = max<int>(ya_min, 0);
+			ya_max = min<int>(ya_max, a.rows() - 1);
+			xa_min = max<int>(xa_min, 0);
+			xa_max = min<int>(xa_max, a.cols() - 1);
 
 			assert(ya_max >= ya_min);
 			assert(xa_max >= xa_min);
@@ -236,16 +241,6 @@ MatrixXf central_convolve(const MatrixXf &a, const MatrixXf &b)
 	return result;
 }
 
-void print_matrix(const MatrixXf &m)
-{
-	for (int y = 0; y < m.rows(); ++y) {
-		for (int x = 0; x < m.cols(); ++x) {
-			printf("%7.4f ", m(x, y));
-		}
-		printf("\n");
-	}
-}
-
 }  // namespace
 
 void DeconvolutionSharpenEffect::update_deconvolution_kernel()
@@ -423,7 +418,7 @@ void DeconvolutionSharpenEffect::update_deconvolution_kernel()
 	last_noise = noise;
 }
 
-void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);