From b8b4bd523c92cb4ff5ede3def77ed52f04941fb3 Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Tue, 25 Apr 2023 12:50:54 -0500
Subject: [PATCH] mqr tests pass

---
 src/common/cpp_essentials/pattern.rs                          | 2 +-
 src/qrcode/cpp_port/detector.rs                               | 4 ++--
 src/qrcode/decoder/version.rs                                 | 3 +++
 ...e-4.15.1-2.result.txt => gs1-figure-4.15.1-2.metadata.txt} | 0
 .../qrcode-2/{qr-inv-1.result.txt => qr-inv-1.metadata.txt}   | 0
 .../blackbox/cpp/qrcode-7/{01.result.txt => 01.metadata.txt}  | 0
 6 files changed, 6 insertions(+), 3 deletions(-)
 rename test_resources/blackbox/cpp/qrcode-2/{gs1-figure-4.15.1-2.result.txt => gs1-figure-4.15.1-2.metadata.txt} (100%)
 rename test_resources/blackbox/cpp/qrcode-2/{qr-inv-1.result.txt => qr-inv-1.metadata.txt} (100%)
 rename test_resources/blackbox/cpp/qrcode-7/{01.result.txt => 01.metadata.txt} (100%)

diff --git a/src/common/cpp_essentials/pattern.rs b/src/common/cpp_essentials/pattern.rs
index 6fcd9c2..969d805 100644
--- a/src/common/cpp_essentials/pattern.rs
+++ b/src/common/cpp_essentials/pattern.rs
@@ -197,7 +197,7 @@ impl<'a> PatternView<'a> {
         self.isValidWithN(self.size())
     }
 
-    fn has_quiet_zone_before(&self, scale: f32, acceptIfAtFirstBar: Option<bool>) -> bool {
+    pub fn has_quiet_zone_before(&self, scale: f32, acceptIfAtFirstBar: Option<bool>) -> bool {
         (acceptIfAtFirstBar.unwrap_or(false) && self.isAtLastBar())
             || Into::<f32>::into(self.data.0[self.count])
                 >= Into::<f32>::into(self.sum(None)) * scale
diff --git a/src/qrcode/cpp_port/detector.rs b/src/qrcode/cpp_port/detector.rs
index 6bbead9..1463a7a 100644
--- a/src/qrcode/cpp_port/detector.rs
+++ b/src/qrcode/cpp_port/detector.rs
@@ -1023,8 +1023,8 @@ pub fn SampleMQR(image: &BitMatrix, fp: ConcentricPattern) -> Result<QRCodeDetec
         dim,
         dim,
         &[SamplerControl {
-            p0: point_i(0, dim as u32),
-            p1: point_i(0, dim as u32),
+            p1: point_i(dim as u32, dim as u32),
+            p0: point_i(0, 0),
             transform: bestPT,
         }],
     )?;
diff --git a/src/qrcode/decoder/version.rs b/src/qrcode/decoder/version.rs
index c4edf30..aeb58c7 100755
--- a/src/qrcode/decoder/version.rs
+++ b/src/qrcode/decoder/version.rs
@@ -113,6 +113,9 @@ impl Version {
     }
 
     pub fn getECBlocksForLevel(&self, ecLevel: ErrorCorrectionLevel) -> &ECBlocks {
+        if ecLevel.get_ordinal() as usize >= self.ecBlocks.len() {
+            return &self.ecBlocks[ecLevel.get_ordinal() as usize % self.ecBlocks.len()];
+        }
         &self.ecBlocks[ecLevel.get_ordinal() as usize]
     }
 
diff --git a/test_resources/blackbox/cpp/qrcode-2/gs1-figure-4.15.1-2.result.txt b/test_resources/blackbox/cpp/qrcode-2/gs1-figure-4.15.1-2.metadata.txt
similarity index 100%
rename from test_resources/blackbox/cpp/qrcode-2/gs1-figure-4.15.1-2.result.txt
rename to test_resources/blackbox/cpp/qrcode-2/gs1-figure-4.15.1-2.metadata.txt
diff --git a/test_resources/blackbox/cpp/qrcode-2/qr-inv-1.result.txt b/test_resources/blackbox/cpp/qrcode-2/qr-inv-1.metadata.txt
similarity index 100%
rename from test_resources/blackbox/cpp/qrcode-2/qr-inv-1.result.txt
rename to test_resources/blackbox/cpp/qrcode-2/qr-inv-1.metadata.txt
diff --git a/test_resources/blackbox/cpp/qrcode-7/01.result.txt b/test_resources/blackbox/cpp/qrcode-7/01.metadata.txt
similarity index 100%
rename from test_resources/blackbox/cpp/qrcode-7/01.result.txt
rename to test_resources/blackbox/cpp/qrcode-7/01.metadata.txt