Remove temporary dummy variable.

Mysticial · Mysticial · commit 31b4de6bb37f · 2025-05-06T00:52:41.000-07:00
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp
@@ -25,7 +25,7 @@ ImageRGB32 filter_rgb32_range(
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         ret.data(), ret.bytes_per_row(),
         (uint32_t)replace_with, replace_color_within_range,
-        mins, maxs, nullptr
+        mins, maxs
     );
     return ret;
 }
@@ -39,7 +39,7 @@ ImageRGB32 filter_rgb32_range(
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         ret.data(), ret.bytes_per_row(),
         (uint32_t)replace_with, replace_color_within_range,
-        mins, maxs, nullptr
+        mins, maxs
     );
     return ret;
 }
@@ -55,7 +55,7 @@ std::vector<std::pair<ImageRGB32, size_t>> filter_rgb32_range(
         subfilters.emplace_back(
             out.data(), out.bytes_per_row(),
             (uint32_t)filters[c].replacement_color, filters[c].replace_color_within_range,
-            filters[c].mins, filters[c].maxs, nullptr
+            filters[c].mins, filters[c].maxs
         );
     }
     Kernels::filter_rgb32_range(
@@ -82,7 +82,7 @@ ImageRGB32 filter_rgb32_euclidean(
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         ret.data(), ret.bytes_per_row(),
         (uint32_t)replace_with, replace_color_within_range,
-        expected, max_euclidean_distance, nullptr
+        expected, max_euclidean_distance
     );
     return ret;
 }
@@ -97,7 +97,7 @@ ImageRGB32 filter_rgb32_euclidean(
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         ret.data(), ret.bytes_per_row(),
         (uint32_t)replace_with, replace_color_within_range,
-        expected, max_euclidean_distance, nullptr
+        expected, max_euclidean_distance
     );
     return ret;
 }
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp
@@ -16,37 +16,37 @@ size_t filter_rgb32_euclidean_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 size_t filter_rgb32_euclidean_x64_SSE42(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 size_t filter_rgb32_euclidean_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 size_t filter_rgb32_euclidean_x64_AVX512(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 size_t filter_rgb32_euclidean_arm64_NEON(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 size_t filter_rgb32_euclidean(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     if (width * height > 0xffffffff){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
@@ -57,7 +57,7 @@ size_t filter_rgb32_euclidean(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            expected, max_euclidean_distance, nullptr
+            expected, max_euclidean_distance
         );
     }
 #endif
@@ -67,7 +67,7 @@ size_t filter_rgb32_euclidean(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            expected, max_euclidean_distance, nullptr
+            expected, max_euclidean_distance
         );
     }
 #endif
@@ -77,7 +77,7 @@ size_t filter_rgb32_euclidean(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            expected, max_euclidean_distance, nullptr
+            expected, max_euclidean_distance
         );
     }
 #endif
@@ -87,15 +87,15 @@ size_t filter_rgb32_euclidean(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            expected, max_euclidean_distance, nullptr
+            expected, max_euclidean_distance
         );
     }
 #endif
     return filter_rgb32_euclidean_Default(
         in, in_bytes_per_row, width, height,
         out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            expected, max_euclidean_distance, nullptr
+            expected, max_euclidean_distance
     );
 }
 
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h
@@ -21,7 +21,7 @@ size_t filter_rgb32_euclidean(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 );
 
 
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp
@@ -93,7 +93,7 @@ size_t filter_rgb32_euclidean_arm64_NEON(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     ImageFilter_RgbEuclidean_arm64_NEON filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp
@@ -76,7 +76,7 @@ size_t filter_rgb32_euclidean_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     ImageFilter_RgbEuclidean_Default filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp
@@ -84,7 +84,7 @@ size_t filter_rgb32_euclidean_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     ImageFilter_RgbEuclidean_x64_AVX2 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp
@@ -96,7 +96,7 @@ size_t filter_rgb32_euclidean_x64_AVX512(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     ImageFilterRunner_Rgb32Euclidean_x64_AVX512 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp
@@ -116,7 +116,7 @@ size_t filter_rgb32_euclidean_x64_SSE42(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t expected, double max_euclidean_distance, void*
+    uint32_t expected, double max_euclidean_distance
 ){
     ImageFilter_RgbEuclidean_x64_SSE42 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp
@@ -18,37 +18,37 @@ size_t filter_rgb32_range_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 size_t filter_rgb32_range_x64_SSE42(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 size_t filter_rgb32_range_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 size_t filter_rgb32_range_x64_AVX512(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 size_t filter_rgb32_range_arm64_NEON(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 size_t filter_rgb32_range(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     if (width * height > 0xffffffff){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
@@ -59,7 +59,7 @@ size_t filter_rgb32_range(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            mins, maxs, nullptr
+            mins, maxs
         );
     }
 #endif
@@ -69,7 +69,7 @@ size_t filter_rgb32_range(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            mins, maxs, nullptr
+            mins, maxs
         );
     }
 #endif
@@ -79,7 +79,7 @@ size_t filter_rgb32_range(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            mins, maxs, nullptr
+            mins, maxs
         );
     }
 #endif
@@ -89,15 +89,15 @@ size_t filter_rgb32_range(
             in, in_bytes_per_row, width, height,
             out, out_bytes_per_row,
             replacement, replace_color_within_range,
-            mins, maxs, nullptr
+            mins, maxs
         );
     }
 #endif
     return filter_rgb32_range_Default(
         in, in_bytes_per_row, width, height,
         out, out_bytes_per_row,
         replacement, replace_color_within_range,
-        mins, maxs, nullptr
+        mins, maxs
     );
 }
 
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h
@@ -24,7 +24,7 @@ size_t filter_rgb32_range(
     const uint32_t* image_in, size_t image_in_bytes_per_row, size_t width, size_t height,
     uint32_t* image_out, size_t image_out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 
 
@@ -44,7 +44,7 @@ struct FilterRgb32RangeFilter{
     FilterRgb32RangeFilter(
         uint32_t* p_data, size_t p_bytes_per_row,
         uint32_t p_replacement, bool p_invert,
-        uint32_t p_mins, uint32_t p_maxs, void*
+        uint32_t p_mins, uint32_t p_maxs
     )
         : data(p_data)
         , bytes_per_row(p_bytes_per_row)
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp
@@ -89,7 +89,7 @@ size_t filter_rgb32_range_arm64_NEON(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageFilterRunner_Rgb32Range_ARM64_NEON filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp
@@ -90,7 +90,7 @@ size_t filter_rgb32_range_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageFilterRunner_Rgb32Range_Default filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp
@@ -77,7 +77,7 @@ size_t filter_rgb32_range_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageFilterRunner_Rgb32Range_x64_AVX2 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp
@@ -94,7 +94,7 @@ size_t filter_rgb32_range_x64_AVX512(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageFilterRunner_Rgb32Range_x64_AVX512 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp
@@ -97,7 +97,7 @@ size_t filter_rgb32_range_x64_SSE42(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageFilterRunner_Rgb32Range_x64_SSE42 filter(
         replacement, replace_color_within_range,
diff --git a/SerialPrograms/Source/Tests/Kernels_Tests.cpp b/SerialPrograms/Source/Tests/Kernels_Tests.cpp
@@ -161,7 +161,7 @@ int test_kernels_FilterRGB32Range(const ImageViewRGB32& image){
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         image_out.data(), image_out.bytes_per_row(),
         (uint32_t)COLOR_WHITE, replace_color_within_range,
-        mins, maxs, nullptr
+        mins, maxs
     );
     auto time_end = current_time();
     auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(time_end - time_start).count();
@@ -172,7 +172,7 @@ int test_kernels_FilterRGB32Range(const ImageViewRGB32& image){
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         image_out_2.data(), image_out_2.bytes_per_row(),
         (uint32_t)COLOR_WHITE, !replace_color_within_range,
-        mins, maxs, nullptr
+        mins, maxs
     );
 
     TEST_RESULT_EQUAL(pixels_in_range, pixels_in_range_2);
@@ -231,7 +231,7 @@ int test_kernels_FilterRGB32Range(const ImageViewRGB32& image){
             image.data(), image.bytes_per_row(), image.width(), image.height(),
             image_out.data(), image_out.bytes_per_row(),
             (uint32_t)COLOR_WHITE, replace_color_within_range,
-            mins, maxs, nullptr
+            mins, maxs
         );
     }
     time_end = current_time();
@@ -263,7 +263,7 @@ int test_kernels_FilterRGB32Euclidean(const ImageViewRGB32& image){
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         image_out.data(), image_out.bytes_per_row(),
         (uint32_t)COLOR_WHITE, replace_color_within_range,
-        uint32_t(middle_color), max_dist, nullptr
+        uint32_t(middle_color), max_dist
     );
     auto time_end = current_time();
     auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(time_end - time_start).count();
@@ -274,7 +274,7 @@ int test_kernels_FilterRGB32Euclidean(const ImageViewRGB32& image){
         image.data(), image.bytes_per_row(), image.width(), image.height(),
         image_out_2.data(), image_out_2.bytes_per_row(),
         (uint32_t)COLOR_WHITE, !replace_color_within_range,
-        uint32_t(middle_color), max_dist, nullptr
+        uint32_t(middle_color), max_dist
     );
 
     TEST_RESULT_EQUAL(pixels_in_range, pixels_in_range_2);
@@ -342,7 +342,7 @@ int test_kernels_FilterRGB32Euclidean(const ImageViewRGB32& image){
             image.data(), image.bytes_per_row(), image.width(), image.height(),
             image_out.data(), image_out.bytes_per_row(),
             (uint32_t)COLOR_WHITE, replace_color_within_range,
-            uint32_t(middle_color), max_dist, nullptr
+            uint32_t(middle_color), max_dist
         );
     }
     time_end = current_time();
