X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect_test.cpp;h=9678aa015cadfff872f0a17950f8c1f537e7c36b;hp=353429ee82a703f5c0f6fcf7c6ef11825ef72c0c;hb=c220f1f515ce115e049dfff990b08b2592bd8f8d;hpb=c62391987241f1482a99b6f6417fbec1d0ef2344

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index 353429e..9678aa0 100644
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -70,7 +70,7 @@ TEST(ResampleEffectTest, UpscaleByTwoGetsCorrectPixelCenters) {
 		}
 	}
 
-	EffectChainTester tester(NULL, size * 2, size * 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size * 2, size * 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -112,7 +112,7 @@ TEST(ResampleEffectTest, DownscaleByTwoGetsCorrectPixelCenters) {
 		}
 	}
 
-	EffectChainTester tester(NULL, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -142,7 +142,7 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
 	};
 	float out_data[size * size * 9];
 
-	EffectChainTester tester(NULL, size * 3, size * 3, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, size * 3, size * 3, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -162,8 +162,8 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
 	EXPECT_FLOAT_EQ(1.0, out_data[7 * (size * 3) + 7]);
 	for (unsigned y = 0; y < size * 3; ++y) {
 		for (unsigned x = 0; x < size * 3; ++x) {
-			EXPECT_FLOAT_EQ(out_data[y * (size * 3) + x], out_data[(size * 3 - y - 1) * (size * 3) + x]);
-			EXPECT_FLOAT_EQ(out_data[y * (size * 3) + x], out_data[y * (size * 3) + (size * 3 - x - 1)]);
+			EXPECT_NEAR(out_data[y * (size * 3) + x], out_data[(size * 3 - y - 1) * (size * 3) + x], 1e-6);
+			EXPECT_NEAR(out_data[y * (size * 3) + x], out_data[y * (size * 3) + (size * 3 - x - 1)], 1e-6);
 		}
 	}
 }
@@ -187,7 +187,7 @@ TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
 		}
 	}
 
-	EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
+	EffectChainTester tester(nullptr, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -317,7 +317,7 @@ TEST(ResampleEffectTest, ReadHalfPixelFromLeftAndScale) {
 	};
 	float out_data[dst_width * 1];
 
-	EffectChainTester tester(NULL, dst_width, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(nullptr, dst_width, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -407,7 +407,7 @@ TEST(ResampleEffectTest, Precision) {
 
 	// Deliberately put the data of interest very close to the right,
 	// where texture coordinates are farther from 0 and thus less precise.
-	float data[size] = {0};
+	float data[size * 2] = {0};
 	data[size - offset] = 1.0f;
 	float expected_data[size * 2] = {0};
 	for (int x = 0; x < size * 2; ++x) {