X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=fft_convolution_effect_test.cpp;h=d1c1626b861670b36d7a52913e0171d71ab7cbf3;hp=a55fe3128ad040e73dccf4268ce0edf17be57e27;hb=7fd447b922234670ae65066915b65a1b4816e095;hpb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1

diff --git a/fft_convolution_effect_test.cpp b/fft_convolution_effect_test.cpp
index a55fe31..d1c1626 100644
--- a/fft_convolution_effect_test.cpp
+++ b/fft_convolution_effect_test.cpp
@@ -29,7 +29,7 @@ TEST(FFTConvolutionEffectTest, Identity) {
 		}
 		kernel[0] = 1.0f;
 
-		EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+		EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 		tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 		FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_size, convolve_size);
@@ -52,10 +52,10 @@ TEST(FFTConvolutionEffectTest, Constant) {
 		0.4, 1.4, 2.4, 3.4,
 	};
 	float expected_data[size * size] = {
-		f * 0.1, f * 1.1, f * 2.1, f * 3.1,
-		f * 0.2, f * 1.2, f * 2.2, f * 3.2,
-		f * 0.3, f * 1.3, f * 2.3, f * 3.3,
-		f * 0.4, f * 1.4, f * 2.4, f * 3.4,
+		f * 0.1f, f * 1.1f, f * 2.1f, f * 3.1f,
+		f * 0.2f, f * 1.2f, f * 2.2f, f * 3.2f,
+		f * 0.3f, f * 1.3f, f * 2.3f, f * 3.3f,
+		f * 0.4f, f * 1.4f, f * 2.4f, f * 3.4f,
 	};
 	float out_data[size * size];
 	float kernel[convolve_size * convolve_size];
@@ -64,7 +64,7 @@ TEST(FFTConvolutionEffectTest, Constant) {
 	}
 	kernel[0] = f;
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 	FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_size, convolve_size);
@@ -98,7 +98,7 @@ TEST(FFTConvolutionEffectTest, MoveRight) {
 	};
 	float out_data[size * size];
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 	FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_size, convolve_size);
@@ -131,7 +131,7 @@ TEST(FFTConvolutionEffectTest, MoveDown) {
 	};
 	float out_data[size * size];
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 	FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_size, convolve_size);
@@ -164,7 +164,7 @@ TEST(FFTConvolutionEffectTest, MergeWithLeft) {
 	};
 	float out_data[size * size];
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 	FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_size, convolve_size);
@@ -197,7 +197,7 @@ TEST(FFTConvolutionEffectTest, NegativeCoefficients) {
 	};
 	float out_data[size * size];
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, size, size);
 
 	FFTConvolutionEffect *fft_effect = new FFTConvolutionEffect(size, size, convolve_width, convolve_height);