From bf0b5a0fb094312f562832fb4d0c75ffaae46c35 Mon Sep 17 00:00:00 2001
From: Filip Kirschner <filip.kirschner@applifting.cz>
Date: Fri, 12 Feb 2021 00:33:57 +0100
Subject: [PATCH 1/3] Decode inverted datamatrices

---
 docs/examples/qr-camera/index.html      |  8 ++++++--
 src/core/MultiFormatReader.ts           |  1 +
 src/core/common/BitMatrix.ts            |  8 ++++++++
 src/core/datamatrix/DataMatrixReader.ts | 15 +++++++++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/docs/examples/qr-camera/index.html b/docs/examples/qr-camera/index.html
index 0aaa4663..9862b804 100644
--- a/docs/examples/qr-camera/index.html
+++ b/docs/examples/qr-camera/index.html
@@ -67,7 +67,7 @@ <h1 class="title">Scan QR Code from Video Camera</h1>
 
   </main>
 
-  <script type="text/javascript" src="https://unpkg.com/@zxing/library@latest"></script>
+  <script type="text/javascript" src="../../../dist/umd/index.min.js"></script>
   <script type="text/javascript">
     function decodeOnce(codeReader, selectedDeviceId) {
       codeReader.decodeFromInputVideoDevice(selectedDeviceId, 'video').then((result) => {
@@ -115,9 +115,13 @@ <h1 class="title">Scan QR Code from Video Camera</h1>
 
     window.addEventListener('load', function () {
       let selectedDeviceId;
-      const codeReader = new ZXing.BrowserQRCodeReader()
+      const codeReader = new ZXing.BrowserMultiFormatReader()
       console.log('ZXing code reader initialized')
 
+      const hints = new Map();
+      hints.set(ZXing.DecodeHintType.POSSIBLE_FORMATS, [ZXing.BarcodeFormat.DATA_MATRIX]);
+      codeReader.setHints = hints;
+
       codeReader.getVideoInputDevices()
         .then((videoInputDevices) => {
           const sourceSelect = document.getElementById('sourceSelect')
diff --git a/src/core/MultiFormatReader.ts b/src/core/MultiFormatReader.ts
index 3b0c1de4..c4d7c660 100644
--- a/src/core/MultiFormatReader.ts
+++ b/src/core/MultiFormatReader.ts
@@ -131,6 +131,7 @@ export default class MultiFormatReader implements Reader {
             }
             if (formats.includes(BarcodeFormat.DATA_MATRIX)) {
               readers.push(new DataMatrixReader());
+              readers.push(new DataMatrixReader(true));
             }
             if (formats.includes(BarcodeFormat.AZTEC)) {
               readers.push(new AztecReader());
diff --git a/src/core/common/BitMatrix.ts b/src/core/common/BitMatrix.ts
index d1499c41..fab51e7e 100644
--- a/src/core/common/BitMatrix.ts
+++ b/src/core/common/BitMatrix.ts
@@ -519,4 +519,12 @@ export default class BitMatrix /*implements Cloneable*/ {
         return new BitMatrix(this.width, this.height, this.rowSize, this.bits.slice());
     }
 
+    public inverted(): BitMatrix {
+        let bitArray = this.bits.slice();
+        for (let _i = 0; _i < bitArray.length; _i++) {
+          bitArray[_i] = ~bitArray[_i];
+        }
+        return new BitMatrix(this.width, this.height, this.rowSize, bitArray);
+    }
+
 }
diff --git a/src/core/datamatrix/DataMatrixReader.ts b/src/core/datamatrix/DataMatrixReader.ts
index 90d45997..c465c6c5 100644
--- a/src/core/datamatrix/DataMatrixReader.ts
+++ b/src/core/datamatrix/DataMatrixReader.ts
@@ -36,6 +36,17 @@ import Detector from './detector/Detector';
  */
 export default class DataMatrixReader implements Reader {
 
+  private isInverted: Boolean = false;
+
+  public constructor(isInverted?: Boolean) {
+    if (isInverted != null && isInverted) {
+      // We use inverted code
+      this.isInverted = true;
+      console.log('inverted!');
+      alert('inverted!');
+    }
+  }
+
   private static NO_POINTS: ResultPoint[] = [];
 
   private decoder: Decoder = new Decoder();
@@ -59,11 +70,11 @@ export default class DataMatrixReader implements Reader {
     let points: ResultPoint[];
 
     if (hints != null && hints.has(DecodeHintType.PURE_BARCODE)) {
-      const bits = DataMatrixReader.extractPureBits(image.getBlackMatrix());
+      const bits = DataMatrixReader.extractPureBits(image.getBlackMatrix().inverted());
       decoderResult = this.decoder.decode(bits);
       points = DataMatrixReader.NO_POINTS;
     } else {
-      const detectorResult = new Detector(image.getBlackMatrix()).detect();
+      const detectorResult = new Detector(image.getBlackMatrix().inverted()).detect();
       decoderResult = this.decoder.decode(detectorResult.getBits());
       points = detectorResult.getPoints();
     }

From 0742b2acab3c2ef9b1a810a39fa8ea300a6b3392 Mon Sep 17 00:00:00 2001
From: Filip Kirschner <filip.kirschner@applifting.cz>
Date: Fri, 12 Feb 2021 00:41:08 +0100
Subject: [PATCH 2/3] cleanup

---
 src/core/MultiFormatReader.ts           |  1 +
 src/core/datamatrix/DataMatrixReader.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/MultiFormatReader.ts b/src/core/MultiFormatReader.ts
index c4d7c660..b59de5d6 100644
--- a/src/core/MultiFormatReader.ts
+++ b/src/core/MultiFormatReader.ts
@@ -154,6 +154,7 @@ export default class MultiFormatReader implements Reader {
 
             readers.push(new QRCodeReader());
             readers.push(new DataMatrixReader());
+            readers.push(new DataMatrixReader(true));
             readers.push(new AztecReader());
             readers.push(new PDF417Reader());
             // readers.push(new MaxiCodeReader())
diff --git a/src/core/datamatrix/DataMatrixReader.ts b/src/core/datamatrix/DataMatrixReader.ts
index c465c6c5..4ea6fdab 100644
--- a/src/core/datamatrix/DataMatrixReader.ts
+++ b/src/core/datamatrix/DataMatrixReader.ts
@@ -42,8 +42,6 @@ export default class DataMatrixReader implements Reader {
     if (isInverted != null && isInverted) {
       // We use inverted code
       this.isInverted = true;
-      console.log('inverted!');
-      alert('inverted!');
     }
   }
 
@@ -70,11 +68,15 @@ export default class DataMatrixReader implements Reader {
     let points: ResultPoint[];
 
     if (hints != null && hints.has(DecodeHintType.PURE_BARCODE)) {
-      const bits = DataMatrixReader.extractPureBits(image.getBlackMatrix().inverted());
+      const bits = this.isInverted ?
+        DataMatrixReader.extractPureBits(image.getBlackMatrix().inverted()) :
+        DataMatrixReader.extractPureBits(image.getBlackMatrix());
       decoderResult = this.decoder.decode(bits);
       points = DataMatrixReader.NO_POINTS;
     } else {
-      const detectorResult = new Detector(image.getBlackMatrix().inverted()).detect();
+      const detectorResult = this.isInverted ?
+        new Detector(image.getBlackMatrix().inverted()).detect() :
+        new Detector(image.getBlackMatrix()).detect();
       decoderResult = this.decoder.decode(detectorResult.getBits());
       points = detectorResult.getPoints();
     }

From 17f2d54e9e4f3b8acdfccc1e29bf1df968c26f82 Mon Sep 17 00:00:00 2001
From: Filip Kirschner <filip.kirschner@applifting.cz>
Date: Fri, 12 Feb 2021 00:56:22 +0100
Subject: [PATCH 3/3] cleanup

---
 src/core/common/BitMatrix.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/core/common/BitMatrix.ts b/src/core/common/BitMatrix.ts
index fab51e7e..6624552d 100644
--- a/src/core/common/BitMatrix.ts
+++ b/src/core/common/BitMatrix.ts
@@ -520,11 +520,7 @@ export default class BitMatrix /*implements Cloneable*/ {
     }
 
     public inverted(): BitMatrix {
-        let bitArray = this.bits.slice();
-        for (let _i = 0; _i < bitArray.length; _i++) {
-          bitArray[_i] = ~bitArray[_i];
-        }
-        return new BitMatrix(this.width, this.height, this.rowSize, bitArray);
+        return new BitMatrix(this.width, this.height, this.rowSize, this.bits.map(byte => ~byte));
     }
 
 }