Merge branch 'feature/multi-qr-code-reader' of https://github.com/zxing-js/library into feature/multi-qr-code-reader

Author: odahcam

CONTRIBUTING.md

@@ -62,6 +62,8 @@ https://docs.oracle.com/javase/tutorial/java/nutsandbolts/datatypes.html
 - `int` has 32 bits, signed, so `int[]` transforms to `Int32Array`.
 - `char` has 2 bytes, so `char[]` transforms to `Uint16Array`.
 - `long` has 64 bit two's complement `integer`, can be signed or unsigned.
+- `float[]` can be ported to `Float32Array`.
+- `double[]` can be ported to `Float64Array`.
 
 ### JavaScript's TypedArray
 
@@ -71,8 +73,8 @@ https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects
 
 - Take care of `int` -> `number` (integer to number) port when doing bitwise transformation especially `<<`. Do a `& 0xFFFFFFFF` for ints, a &0xFF for bytes.
 - Take care of array initialization, in Java `new Array(N)` initializes capacity NOT size/length.
-- Use `Math.floor` for any division of ints otherwise the `number` type is a floating point and keeps the numbers after the dot.
-- For `float` to `int` casting use `Math.trunc`, to replicate the same effect as Java casting does.
+- Use `Math.floor` for any division of `int`s otherwise the `number` type is a floating point and keeps the numbers after the dot.
+- For `float`/`number` to `int` casting use `Math.trunc`, to replicate the same effect as Java casting does.
 
 ## Encoding
 

src/core/multi/qrcode/QRCodeMultiReader.ts

@@ -175,7 +175,7 @@ export default /*public final*/ class QRCodeMultiReader extends QRCodeReader imp
     if (newByteSegment.size() > 0) {
       newResult.putMetadata(ResultMetadataType.BYTE_SEGMENTS, Collections.singletonList(newByteSegment.toByteArray()));
     }
-    newResults.unshift(newResult); // TYPESCRIPTPORT: inserted element at the start of the array because it seems the Java version does that as well.
+    newResults.push(newResult); // TYPESCRIPTPORT: inserted element at the start of the array because it seems the Java version does that as well.
     return newResults;
   }
 

src/core/multi/qrcode/detector/MultiFinderPatternFinder.ts

@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-import { BitMatrix, NotFoundException, ResultPoint, DecodeHintType } from "src";
-import FinderPattern from "src/core/qrcode/detector/FinderPattern";
-import FinderPatternFinder from "src/core/qrcode/detector/FinderPatternFinder";
-import FinderPatternInfo from "src/core/qrcode/detector/FinderPatternInfo";
-import ResultPointCallback from "src/core/ResultPointCallback";
-import Collections from "src/core/util/Collections";
-import Comparator from "src/core/util/Comparator";
-import { double, float, int, List } from "src/customTypings";
+import BitMatrix from 'src/core/common/BitMatrix';
+import DecodeHintType from 'src/core/DecodeHintType';
+import NotFoundException from 'src/core/NotFoundException';
+import FinderPattern from 'src/core/qrcode/detector/FinderPattern';
+import FinderPatternFinder from 'src/core/qrcode/detector/FinderPatternFinder';
+import FinderPatternInfo from 'src/core/qrcode/detector/FinderPatternInfo';
+import ResultPoint from 'src/core/ResultPoint';
+import ResultPointCallback from 'src/core/ResultPointCallback';
+import Collections from 'src/core/util/Collections';
+import Comparator from 'src/core/util/Comparator';
+import { double, float, int, List } from 'src/customTypings';
 
 // package com.google.zxing.multi.qrcode.detector;
 
@@ -228,32 +231,32 @@ export default /* public final */ class MultiFinderPatternFinder extends FinderP
     // image, and then account for the center being 3 modules in size. This gives the smallest
     // number of pixels the center could be, so skip this often. When trying harder, look for all
     // QR versions regardless of how dense they are.
-    let iSkip: int = (3 * maxI) / (4 * MultiFinderPatternFinder.MAX_MODULES);
+    let iSkip: int = Math.trunc((3 * maxI) / (4 * MultiFinderPatternFinder.MAX_MODULES)); // TYPESCRIPTPORT: Java integer divisions always discard decimal chars.
     if (iSkip < MultiFinderPatternFinder.MIN_SKIP || tryHarder) {
       iSkip = MultiFinderPatternFinder.MIN_SKIP;
     }
 
     const stateCount: Int32Array = Int32Array.from({ length: 5 });
     for (let i: int = iSkip - 1; i < maxI; i += iSkip) {
       // Get a row of black/white values
-      MultiFinderPatternFinder.doClearCounts(stateCount);
+      this.clearCounts(stateCount);
       let currentState: int = 0;
       for (let j: int = 0; j < maxJ; j++) {
         if (image.get(j, i)) {
           // Black pixel
-          if ((currentState & 1) == 1) { // Counting white pixels
+          if ((currentState & 1) === 1) { // Counting white pixels
             currentState++;
           }
           stateCount[currentState]++;
         } else { // White pixel
-          if ((currentState & 1) == 0) { // Counting black pixels
-            if (currentState == 4) { // A winner?
-              if (MultiFinderPatternFinder.foundPatternCross(stateCount) && this.handlePossibleCenter2(stateCount, i, j)) { // Yes
+          if ((currentState & 1) === 0) { // Counting black pixels
+            if (currentState === 4) { // A winner?
+              if (MultiFinderPatternFinder.foundPatternCross(stateCount) && this.handlePossibleCenter(stateCount, i, j)) { // Yes
                 // Clear state to start looking again
                 currentState = 0;
-                MultiFinderPatternFinder.doClearCounts(stateCount);
+                this.clearCounts(stateCount);
               } else { // No, shift counts back by two
-                MultiFinderPatternFinder.doShiftCounts2(stateCount);
+                this.shiftCounts2(stateCount);
                 currentState = 3;
               }
             } else {
@@ -266,7 +269,7 @@ export default /* public final */ class MultiFinderPatternFinder extends FinderP
       } // for j=...
 
       if (MultiFinderPatternFinder.foundPatternCross(stateCount)) {
-        this.handlePossibleCenter2(stateCount, i, maxJ);
+        this.handlePossibleCenter(stateCount, i, maxJ);
       }
     } // for i=iSkip-1 ...
     const patternInfo: FinderPattern[][] = this.selectMultipleBestPatterns();