From 44d65ba68650b1a7ccfdceeed61f4c8a90546296 Mon Sep 17 00:00:00 2001 From: Chris Cinelli Date: Mon, 30 Dec 2019 15:33:01 -0800 Subject: [PATCH] #148 Fix onlyInvert --- dist/jsQR.js | 2 +- docs/jsQR.js | 2 +- src/index.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/jsQR.js b/dist/jsQR.js index 1e7a276b..3b73d8a4 100644 --- a/dist/jsQR.js +++ b/dist/jsQR.js @@ -369,8 +369,8 @@ function jsQR(data, width, height, providedOptions) { var options = Object.create(null); mergeObject(options, defaultOptions); mergeObject(options, providedOptions); - var shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst"; var tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst"; + var shouldInvert = options.inversionAttempts === "attemptBoth" || tryInvertedFirst; var _a = binarizer_1.binarize(data, width, height, shouldInvert, options.canOverwriteImage), binarized = _a.binarized, inverted = _a.inverted; var result = scan(tryInvertedFirst ? inverted : binarized); if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) { diff --git a/docs/jsQR.js b/docs/jsQR.js index 1e7a276b..3b73d8a4 100644 --- a/docs/jsQR.js +++ b/docs/jsQR.js @@ -369,8 +369,8 @@ function jsQR(data, width, height, providedOptions) { var options = Object.create(null); mergeObject(options, defaultOptions); mergeObject(options, providedOptions); - var shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst"; var tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst"; + var shouldInvert = options.inversionAttempts === "attemptBoth" || tryInvertedFirst; var _a = binarizer_1.binarize(data, width, height, shouldInvert, options.canOverwriteImage), binarized = _a.binarized, inverted = _a.inverted; var result = scan(tryInvertedFirst ? inverted : binarized); if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) { diff --git a/src/index.ts b/src/index.ts index a079a013..0d097ef0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,8 +77,8 @@ function jsQR(data: Uint8ClampedArray, width: number, height: number, providedOp mergeObject(options, defaultOptions); mergeObject(options, providedOptions); - const shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst"; const tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst"; + const shouldInvert = options.inversionAttempts === "attemptBoth" || tryInvertedFirst; const {binarized, inverted} = binarize(data, width, height, shouldInvert, options.canOverwriteImage); let result = scan(tryInvertedFirst ? inverted : binarized); if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) {