From 94a2e9f4187b6e57978084245c6b6eec248889c9 Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Tue, 30 May 2023 16:12:01 -0500
Subject: [PATCH] c++ 1169e84911a8fe19a8fe21fe87a96d4afc8bbae9

---
 .../cpp_essentials/concentric_finder.rs       | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/common/cpp_essentials/concentric_finder.rs b/src/common/cpp_essentials/concentric_finder.rs
index de3b15d..0263a6d 100644
--- a/src/common/cpp_essentials/concentric_finder.rs
+++ b/src/common/cpp_essentials/concentric_finder.rs
@@ -613,7 +613,11 @@ pub fn FinetuneConcentricPatternCenter(
         }
         // and then either at least one more ring around that
         if let Some(res2) = CenterOfRings(image, res1, range, finderPatternSize / 2) {
-            return Some(res2);
+            return if image.get_point(res2) {
+                Some(res2)
+            } else {
+                None
+            };
         }
         // or the center can be approximated by a square
         if FitSquareToPoints(image, res1, range, 1, false).is_some() {
@@ -623,27 +627,12 @@ pub fn FinetuneConcentricPatternCenter(
         if let Some(res2) =
             CenterOfDoubleCross(image, res1.floor(), range, finderPatternSize / 2 + 1)
         {
-            return Some(res2);
+            return if image.get_point(res2) {
+                Some(res2)
+            } else {
+                None
+            };
         }
     }
     None
-
-    // // make sure we have at least one path of white around the center
-    // let res = CenterOfRing(image, center, range, 1, false)?;
-
-    // let center = res;
-
-    // let mut res = CenterOfRings(image, center, range, finderPatternSize / 2);
-
-    // if res.is_none() || !image.get_point(res?) {
-    //     res = CenterOfDoubleCross(image, center, range, finderPatternSize / 2 + 1);
-    // }
-    // if res.is_none() || !image.get_point(res?) {
-    //     res = Some(center);
-    // }
-    // if res.is_none() || !image.get_point(res?) {
-    //     return None;
-    // }
-
-    // res
 }