Reorder parameters for front-end API using dummy parameter again.

Mysticial · Mysticial · commit 330372f10d83 · 2025-05-06T01:32:52.000-07:00
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp
@@ -110,7 +110,8 @@ ImageRGB32 filter_rgb32_euclidean(
 
 ImageRGB32 to_blackwhite_rgb32_range(
     const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs, void*
 ){
     ImageRGB32 ret(image.width(), image.height());
     Kernels::to_blackwhite_rgb32_range(
@@ -124,7 +125,8 @@ ImageRGB32 to_blackwhite_rgb32_range(
 ImageRGB32 to_blackwhite_rgb32_range(
     size_t& pixels_in_range,
     const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs, void*
 ){
     ImageRGB32 ret(image.width(), image.height());
     pixels_in_range = Kernels::to_blackwhite_rgb32_range(
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.h b/SerialPrograms/Source/CommonTools/Images/ImageFilter.h
@@ -38,10 +38,10 @@ ImageRGB32 filter_rgb32_range(
 
 
 struct FilterRgb32Range{
-    uint32_t mins;
-    uint32_t maxs;
     Color replacement_color;
     bool replace_color_within_range;
+    uint32_t mins;
+    uint32_t maxs;
 };
 //  Run multiple filters at once. This is more memory efficient than making
 //  multiple calls to one filter at a time.
@@ -86,7 +86,8 @@ ImageRGB32 filter_rgb32_euclidean(
 //  Both white and black colors have alpha=255.
 ImageRGB32 to_blackwhite_rgb32_range(
     const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs, void*
 );
 //  Convert the image to black and white.
 //  Inside [mins, maxs] is white, otherwise it's black.
@@ -96,7 +97,8 @@ ImageRGB32 to_blackwhite_rgb32_range(
 ImageRGB32 to_blackwhite_rgb32_range(
     size_t& pixels_in_range,
     const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs, void*
 );
 
 
@@ -109,9 +111,9 @@ ImageRGB32 to_blackwhite_rgb32_range(
 //  Both white and black colors have alpha=255.
 //  For each filter, return the filtered image and the # of pixels inside the [mins, maxs] range of the filter.
 struct BlackWhiteRgb32Range{
+    bool in_range_black;
     uint32_t mins;
     uint32_t maxs;
-    bool in_range_black;
 };
 std::vector<std::pair<ImageRGB32, size_t>> to_blackwhite_rgb32_range(
     const ImageViewRGB32& image,
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp
@@ -132,7 +132,11 @@ std::string  read_number_waterfill_no_normalization(
     //  Direct OCR is unreliable. Instead, we will waterfill each character
     //  to isolate them, then OCR them individually.
 
-    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, rgb32_min, rgb32_max, text_inside_range);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(
+        image,
+        text_inside_range,
+        rgb32_min, rgb32_max, nullptr
+    );
 
 //    static int c = 0;
 //    filtered.save("zztest-" + std::to_string(c++) + ".png");
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp
@@ -26,7 +26,9 @@ StringMatchResult multifiltered_OCR(
 
     std::vector<BlackWhiteRgb32Range> bw_filters;
     for (const auto& range : text_color_ranges){
-        bw_filters.emplace_back(BlackWhiteRgb32Range{range.mins, range.maxs, true});
+        bw_filters.emplace_back(
+            BlackWhiteRgb32Range{true, range.mins, range.maxs}
+        );
     }
     std::vector<std::pair<ImageRGB32, size_t>> filtered_images = to_blackwhite_rgb32_range(image, bw_filters);
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
@@ -251,8 +251,8 @@ std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::share
 ImageRGB32 DateReader::filter_image(const ImageViewRGB32& image, bool white_theme){
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         image,
-        0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f,
-        white_theme
+        white_theme,
+        0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f, nullptr
     );
     return filtered;
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
@@ -107,7 +107,8 @@ std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
 uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
     ImageRGB32 image = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box_quantity),
-        0xff808080, 0xffffffff, true
+        true,
+        0xff808080, 0xffffffff, nullptr
     );
     int qty = OCR::read_number(m_stream.logger(), image);
     return (uint16_t)std::max(qty, 0);
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp
@@ -360,7 +360,12 @@ struct MountDetectorFilteredImage{
 std::vector<MountDetectorFilteredImage> run_filters(const ImageViewRGB32& image, const std::vector<std::pair<uint32_t, uint32_t>>& range){
     std::vector<FilterRgb32Range> filters;
     for (size_t c = 0; c < range.size(); c++){
-        filters.emplace_back(FilterRgb32Range{range[c].first, range[c].second, COLOR_BLACK, false});
+        filters.emplace_back(
+            FilterRgb32Range{
+                COLOR_BLACK, false,
+                range[c].first, range[c].second
+            }
+        );
     }
 
     std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image, range);
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
@@ -45,7 +45,11 @@ class PokemonTasksReader{
         std::array<int, 9> tasks{};
         for (size_t i = 0; i < m_tasks_box.size(); ++i)
         {
-            ImageRGB32 image = to_blackwhite_rgb32_range(extract_box_reference(screen, m_tasks_box[i]), 0xff808080, 0xffffffff, false);
+            ImageRGB32 image = to_blackwhite_rgb32_range(
+                extract_box_reference(screen, m_tasks_box[i]),
+                false,
+                0xff808080, 0xffffffff, nullptr
+            );
             tasks[i] = OCR::read_number(m_stream.logger(), image);
         }
         return tasks;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp
@@ -41,14 +41,14 @@ std::pair<uint8_t, uint8_t> ItemPrinterJobsDetector::read_box(
     std::vector<std::pair<ImageRGB32, size_t>> filtered = to_blackwhite_rgb32_range(
         cropped,
         {
-            {0xff808080, 0xffffffff, true},
-            {0xff909090, 0xffffffff, true},
-            {0xffa0a0a0, 0xffffffff, true},
-            {0xffb0b0b0, 0xffffffff, true},
-            {0xffc0c0c0, 0xffffffff, true},
-            {0xffd0d0d0, 0xffffffff, true},
-            {0xffe0e0e0, 0xffffffff, true},
-            {0xfff0f0f0, 0xffffffff, true},
+            {true, 0xff808080, 0xffffffff},
+            {true, 0xff909090, 0xffffffff},
+            {true, 0xffa0a0a0, 0xffffffff},
+            {true, 0xffb0b0b0, 0xffffffff},
+            {true, 0xffc0c0c0, 0xffffffff},
+            {true, 0xffd0d0d0, 0xffffffff},
+            {true, 0xffe0e0e0, 0xffffffff},
+            {true, 0xfff0f0f0, 0xffffffff},
         }
     );
 
diff --git a/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp
@@ -91,8 +91,8 @@ int16_t ItemPrinterMaterialDetector::read_number(
     ImageViewRGB32 cropped = extract_box_reference(screen, box);
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         cropped,
-        0xff000000, 0xff808080,
-        true
+        true,
+        0xff000000, 0xff808080, nullptr
     );
     // filtered.save("DebugDumps/test-one-filter-1.png");
     bool is_dark_text_light_background = image_stats(filtered).average.sum() > 400;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp
@@ -185,8 +185,8 @@ double ItemPrinterPrizeReader::average_sum_filtered(const ImageViewRGB32& screen
     ImageViewRGB32 cropped = extract_box_reference(screen, box);
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         cropped,
-        0xff808000, 0xffffffff,
-        false
+        false,
+        0xff808000, 0xffffffff, nullptr
     );    
 
     return image_stats(filtered).average.sum();
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp
@@ -58,7 +58,8 @@ std::string SandwichPlateDetector::detect_filling_name(const ImageViewRGB32& scr
     for (uint32_t image_filter_low_bound : image_filter_low_bounds){
         ImageRGB32 plate_label = to_blackwhite_rgb32_range(
             extract_box_reference(screen, m_box),
-            image_filter_low_bound, image_filter_high_bound, true
+            true,
+            image_filter_low_bound, image_filter_high_bound, nullptr
         );
 
         // dump_debug_image(m_logger, "PokemonSV/SandwichPlateDetector", "blackwhite_input", plate_label);
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
@@ -46,8 +46,11 @@ void SandwichRecipeNumberDetector::detect_recipes(const ImageViewRGB32& screen,
         auto cropped_image = extract_box_reference(screen, m_id_boxes[i]);
 
         const bool invert_blackwhite = true;
-        ImageRGB32 filterd_image = to_blackwhite_rgb32_range(cropped_image,
-            combine_rgb(180, 180, 180), combine_rgb(255, 255, 255), invert_blackwhite);
+        ImageRGB32 filterd_image = to_blackwhite_rgb32_range(
+            cropped_image,
+            invert_blackwhite,
+            combine_rgb(180, 180, 180), combine_rgb(255, 255, 255), nullptr
+        );
         
         // filterd_image.save("./tmp_fil_" + std::to_string(i) + ".png");
 
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp
@@ -51,7 +51,8 @@ std::string BlueberryQuestDetector::detect_quest(const ImageViewRGB32& screen) c
 
     ImageRGB32 quest_label = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box),
-        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), true
+        true,
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), nullptr
     );
 
     //quest_label.save("quest_label.png");
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
@@ -155,7 +155,7 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
     //  Direct OCR is unreliable. Instead, we will waterfill each character
     //  to isolate them, then OCR them individually.
 
-    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, 0xff000000, threshold, true);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, true, 0xff000000, threshold, nullptr);
     PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, threshold);
 
     std::map<size_t, WaterfillObject> map;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
@@ -28,7 +28,11 @@ ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_SILHOUETTE_MATCHER(){
             item.first == "error"){
             continue;
         }
-        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(item.second.icon, 0xff000000, 0xff5f5f5f, true);
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(
+            item.second.icon,
+            true,
+            0xff000000, 0xff5f5f5f, nullptr
+        );
         matcher.add(item.first, filtered_image);
     }
     return matcher;
@@ -94,7 +98,7 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
 //        processed_image.save("tera_processed_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check4" << endl;
-        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, true, 0xff000000, 0xff5f5f5f, nullptr);
 //        filtered_image.save("tera_filtered_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check5" << endl;
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp
@@ -160,7 +160,8 @@ int read_BP(const ProgramInfo& info, VideoStream& stream, ProControllerContext&
     VideoSnapshot screen = stream.video().snapshot();
     ImageRGB32 BP_value = to_blackwhite_rgb32_range(
         extract_box_reference(screen, ImageFloatBox(0.866, 0.019, 0.091, 0.041)),
-        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), true
+        true,
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), nullptr
     );
 
     //Close panel
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
@@ -175,14 +175,16 @@ void TournamentFarmer::check_money(SingleSwitchProgramEnvironment& env, ProContr
 
         ImageRGB32 image_top = to_blackwhite_rgb32_range(
             extract_box_reference(screen, top_notif),
-            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
+            true,
+            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), nullptr
         );
         //image_top.save("./image_top.png");
 
         //Different color range on the bottom notif ~B0B5B8
         ImageRGB32 image_bottom = to_blackwhite_rgb32_range(
             extract_box_reference(screen, bottom_notif),
-            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240), true
+            true,
+            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240), nullptr
         );
         //image_bottom.save("./image_bottom.png");
         
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
@@ -91,13 +91,13 @@ void wait_for_video_code_and_join(
             env.log("OCR: " + code);
             break;
         case VideoFceOcrMethod::BLACK_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, 0xff000000, 0xff7f7f7f, true);
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xff000000, 0xff7f7f7f, nullptr);
             code = OCR::ocr_read(Language::English, filtered);
             env.log("OCR: " + code);
             break;
         }
         case VideoFceOcrMethod::WHITE_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, 0xffc0c0c0, 0xffffffff, true);
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xffc0c0c0, 0xffffffff, nullptr);
             code = OCR::ocr_read(Language::English, filtered);
             env.log("OCR: " + code);
             break;
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
@@ -113,7 +113,8 @@ std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
 uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
     ImageRGB32 image = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box_quantity),
-        0xff808080, 0xffffffff, true
+        true,
+        0xff808080, 0xffffffff, nullptr
     );
     int qty = OCR::read_number(m_stream.logger(), image);
     return (uint16_t)std::max(qty, 0);
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
@@ -141,7 +141,11 @@ int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image){
 //    cout << "============" << endl;
     for (const auto& item : filters){
         size_t text_pixels;
-        processed = to_blackwhite_rgb32_range(text_pixels, image, item.first, item.second, false);
+        processed = to_blackwhite_rgb32_range(
+            text_pixels, image,
+            false,
+            item.first, item.second, nullptr
+        );
         double text_ratio = 1.0 - (double)text_pixels / (image.width() * image.height());
 //        cout << "text_ratio = " << text_ratio << endl;
         if (0.02 <= text_ratio && text_ratio <= 0.50){
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
@@ -109,7 +109,8 @@ std::shared_ptr<const ImageRGB32> enter_lobby(
             arrow_count = 0;
             ImageRGB32 image = to_blackwhite_rgb32_range(
                 extract_box_reference(screen, ore_quantity),
-                0xff808080, 0xffffffff, true
+                true,
+                0xff808080, 0xffffffff, nullptr
             );
             ImageRGB32 filtered = pad_image(image, 10, 0xffffffff);
             ore.update_with_ocr(stream.logger(), filtered);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ StringMatchResult multifiltered_OCR(`
`26`	`26`
`27`	`27`	`std::vector<BlackWhiteRgb32Range> bw_filters;`
`28`	`28`	`for (const auto& range : text_color_ranges){`
`29`		`- bw_filters.emplace_back(BlackWhiteRgb32Range{range.mins, range.maxs, true});`
	`29`	`+ bw_filters.emplace_back(`
	`30`	`+ BlackWhiteRgb32Range{true, range.mins, range.maxs}`
	`31`	`+ );`
`30`	`32`	`}`
`31`	`33`	`std::vector<std::pair<ImageRGB32, size_t>> filtered_images = to_blackwhite_rgb32_range(image, bw_filters);`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,11 @@ class PokemonTasksReader{`
`45`	`45`	`std::array<int, 9> tasks{};`
`46`	`46`	`for (size_t i = 0; i < m_tasks_box.size(); ++i)`
`47`	`47`	`{`
`48`		`- ImageRGB32 image = to_blackwhite_rgb32_range(extract_box_reference(screen, m_tasks_box[i]), 0xff808080, 0xffffffff, false);`
	`48`	`+ ImageRGB32 image = to_blackwhite_rgb32_range(`
	`49`	`+ extract_box_reference(screen, m_tasks_box[i]),`
	`50`	`+ false,`
	`51`	`+ 0xff808080, 0xffffffff, nullptr`
	`52`	`+ );`
`49`	`53`	`tasks[i] = OCR::read_number(m_stream.logger(), image);`
`50`	`54`	`}`
`51`	`55`	`return tasks;`