X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=deconvolution_sharpen_effect.cpp;h=f564b68c4bcc62f350b88ca929d46d4f4cd1bec3;hp=ab28eb387d980ec8923ec150b1f3903e04e85f10;hb=0cdd6e9e30a807056699ed9b3fa023a23ce83af9;hpb=71a27346652e54781215737255f757f6292ff120

diff --git a/deconvolution_sharpen_effect.cpp b/deconvolution_sharpen_effect.cpp
index ab28eb3..f564b68 100644
--- a/deconvolution_sharpen_effect.cpp
+++ b/deconvolution_sharpen_effect.cpp
@@ -2,17 +2,24 @@
 // 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;
+
+namespace movit {
 
 DeconvolutionSharpenEffect::DeconvolutionSharpenEffect()
 	: R(5),
@@ -33,7 +40,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 +173,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 +223,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 +243,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()
@@ -268,8 +265,7 @@ void DeconvolutionSharpenEffect::update_deconvolution_kernel()
 			if (gaussian_radius < 1e-3) {
 				val = (x == 0 && y == 0) ? 1.0f : 0.0f;
 			} else {
-				float z = hypot(x, y) / gaussian_radius;
-				val = exp(-z * z);
+				val = exp(-(x*x + y*y) / (2.0 * gaussian_radius * gaussian_radius));
 			}
 			gaussian_h(y + 2 * R, x + 2 * R) = val;
 		}
@@ -307,7 +303,7 @@ void DeconvolutionSharpenEffect::update_deconvolution_kernel()
 	MatrixXf r_uu(8 * R + 1, 8 * R + 1);
 	for (int y = -4 * R; y <= 4 * R; ++y) {	
 		for (int x = -4 * R; x <= 4 * R; ++x) {
-			r_uu(x + 4 * R, y + 4 * R) = pow(correlation, hypot(x, y));
+			r_uu(x + 4 * R, y + 4 * R) = pow(double(correlation), hypot(x, y));
 		}
 	}
 
@@ -424,7 +420,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);
 
@@ -450,3 +446,5 @@ void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std
 
 	set_uniform_vec4_array(glsl_program_num, prefix, "samples", samples, (R + 1) * (R + 1));
 }
+
+}  // namespace movit