From 307b6462f65ae9d1cb63db77d6876ff0fcd748c7 Mon Sep 17 00:00:00 2001 From: codemasher Date: Tue, 19 Jan 2021 00:24:16 +0100 Subject: [PATCH] :octocat: QRMatrix::M_*TYPE rework, separate masking --- examples/fpdf.php | 31 +++++----- examples/html.php | 49 ++++++---------- examples/image.php | 39 +++++++------ examples/imagick.php | 34 +++++------ examples/svg.php | 34 +++++------ examples/text.php | 32 ++++++----- src/Data/QRData.php | 3 +- src/Data/QRMatrix.php | 99 +++++++++++++++++++++----------- src/Output/QROutputInterface.php | 40 ++++++------- tests/Data/QRMatrixTest.php | 59 +++++++++++++------ tests/Output/QRMarkupTest.php | 6 +- tests/Output/QRStringTest.php | 10 ++-- tests/Output/samples/json | 2 +- tests/Output/samples/svg | 2 +- 14 files changed, 246 insertions(+), 194 deletions(-) diff --git a/examples/fpdf.php b/examples/fpdf.php index b231e49e0..a693df725 100644 --- a/examples/fpdf.php +++ b/examples/fpdf.php @@ -3,6 +3,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once __DIR__ . '/../vendor/autoload.php'; @@ -17,29 +18,29 @@ $options = new QROptions([ 'imageBase64' => false, 'moduleValues' => [ // finder - 1536 => [0, 63, 255], // dark (true) - 6 => [255, 255, 255], // light (false), white is the transparency color and is enabled by default + QRMatrix::M_FINDER | QRMatrix::IS_DARK => [0, 63, 255], // dark (true) + QRMatrix::M_FINDER => [255, 255, 255], // light (false), white is the transparency color and is enabled by default // alignment - 2560 => [255, 0, 255], - 10 => [255, 255, 255], + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => [255, 0, 255], + QRMatrix::M_ALIGNMENT => [255, 255, 255], // timing - 3072 => [255, 0, 0], - 12 => [255, 255, 255], + QRMatrix::M_TIMING | QRMatrix::IS_DARK => [255, 0, 0], + QRMatrix::M_TIMING => [255, 255, 255], // format - 3584 => [67, 191, 84], - 14 => [255, 255, 255], + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => [67, 191, 84], + QRMatrix::M_FORMAT => [255, 255, 255], // version - 4096 => [62, 174, 190], - 16 => [255, 255, 255], + QRMatrix::M_VERSION | QRMatrix::IS_DARK => [62, 174, 190], + QRMatrix::M_VERSION => [255, 255, 255], // data - 1024 => [0, 0, 0], - 4 => [255, 255, 255], + QRMatrix::M_DATA | QRMatrix::IS_DARK => [0, 0, 0], + QRMatrix::M_DATA => [255, 255, 255], // darkmodule - 512 => [0, 0, 0], + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => [0, 0, 0], // separator - 8 => [255, 255, 255], + QRMatrix::M_SEPARATOR => [255, 255, 255], // quietzone - 18 => [255, 255, 255], + QRMatrix::M_QUIETZONE => [255, 255, 255], ], ]); diff --git a/examples/html.php b/examples/html.php index 34140671c..e7d658961 100644 --- a/examples/html.php +++ b/examples/html.php @@ -11,6 +11,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once '../vendor/autoload.php'; @@ -25,20 +26,12 @@ header('Content-Type: text/html; charset=utf-8'); QRCode test -
5, 'outputType' => QRCode::OUTPUT_MARKUP_HTML, 'eccLevel' => EccLevel::L, + 'cssClass' => 'qrcode', 'moduleValues' => [ // finder - 1536 => '#A71111', // dark (true) - 6 => '#FFBFBF', // light (false) + QRMatrix::M_FINDER | QRMatrix::IS_DARK => '#A71111', // dark (true) + QRMatrix::M_FINDER => '#FFBFBF', // light (false) + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => '#A71111', // finder dot, dark (true) // alignment - 2560 => '#A70364', - 10 => '#FFC9C9', + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => '#A70364', + QRMatrix::M_ALIGNMENT => '#FFC9C9', // timing - 3072 => '#98005D', - 12 => '#FFB8E9', + QRMatrix::M_TIMING | QRMatrix::IS_DARK => '#98005D', + QRMatrix::M_TIMING => '#FFB8E9', // format - 3584 => '#003804', - 14 => '#00FB12', + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => '#003804', + QRMatrix::M_FORMAT => '#00FB12', // version - 4096 => '#650098', - 16 => '#E0B8FF', + QRMatrix::M_VERSION | QRMatrix::IS_DARK => '#650098', + QRMatrix::M_VERSION => '#E0B8FF', // data - 1024 => '#4A6000', - 4 => '#ECF9BE', + QRMatrix::M_DATA | QRMatrix::IS_DARK => '#4A6000', + QRMatrix::M_DATA => '#ECF9BE', // darkmodule - 512 => '#080063', + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => '#080063', // separator - 8 => '#AFBFBF', + QRMatrix::M_SEPARATOR => '#AFBFBF', // quietzone - 18 => '#FFFFFF', + QRMatrix::M_QUIETZONE => '#DDDDDD', ], ]); echo (new QRCode($options))->render($data); ?> -
diff --git a/examples/image.php b/examples/image.php index 99d3ceab8..6d9069f33 100644 --- a/examples/image.php +++ b/examples/image.php @@ -11,6 +11,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once __DIR__.'/../vendor/autoload.php'; @@ -18,39 +19,39 @@ require_once __DIR__.'/../vendor/autoload.php'; $data = 'https://www.youtube.com/watch?v=DLzxrzFCyOs&t=43s'; $options = new QROptions([ - 'version' => 10, + 'version' => 5, 'outputType' => QRCode::OUTPUT_IMAGE_PNG, 'eccLevel' => EccLevel::L, 'scale' => 5, 'imageBase64' => false, 'moduleValues' => [ // finder - 1536 => [0, 63, 255], // dark (true) - 6 => [255, 255, 255], // light (false), white is the transparency color and is enabled by default - 5632 => [241, 28, 163], // finder dot, dark (true) + QRMatrix::M_FINDER | QRMatrix::IS_DARK => [0, 63, 255], // dark (true) + QRMatrix::M_FINDER => [255, 255, 255], // light (false), white is the transparency color and is enabled by default + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => [241, 28, 163], // finder dot, dark (true) // alignment - 2560 => [255, 0, 255], - 10 => [255, 255, 255], + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => [255, 0, 255], + QRMatrix::M_ALIGNMENT => [255, 255, 255], // timing - 3072 => [255, 0, 0], - 12 => [255, 255, 255], + QRMatrix::M_TIMING | QRMatrix::IS_DARK => [255, 0, 0], + QRMatrix::M_TIMING => [255, 255, 255], // format - 3584 => [67, 99, 84], - 14 => [255, 255, 255], + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => [67, 99, 84], + QRMatrix::M_FORMAT => [255, 255, 255], // version - 4096 => [62, 174, 190], - 16 => [255, 255, 255], + QRMatrix::M_VERSION | QRMatrix::IS_DARK => [62, 174, 190], + QRMatrix::M_VERSION => [255, 255, 255], // data - 1024 => [0, 0, 0], - 4 => [255, 255, 255], + QRMatrix::M_DATA | QRMatrix::IS_DARK => [0, 0, 0], + QRMatrix::M_DATA => [255, 255, 255], // darkmodule - 512 => [0, 0, 0], + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => [0, 0, 0], // separator - 8 => [255, 255, 255], + QRMatrix::M_SEPARATOR => [255, 255, 255], // quietzone - 18 => [255, 255, 255], - // logo (requires a call to QRMatrix::setLogoSpace()) - 20 => [255, 255, 255], + QRMatrix::M_QUIETZONE => [255, 255, 255], + // logo (requires a call to QRMatrix::setLogoSpace()), see QRImageWithLogo + QRMatrix::M_LOGO => [255, 255, 255], ], ]); diff --git a/examples/imagick.php b/examples/imagick.php index 38162972f..fb0561f06 100644 --- a/examples/imagick.php +++ b/examples/imagick.php @@ -1,7 +1,7 @@ * @copyright 2017 Smiley @@ -11,6 +11,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once __DIR__.'/../vendor/autoload.php'; @@ -24,29 +25,30 @@ $options = new QROptions([ 'scale' => 5, 'moduleValues' => [ // finder - 1536 => '#A71111', // dark (true) - 6 => '#FFBFBF', // light (false) + QRMatrix::M_FINDER | QRMatrix::IS_DARK => '#A71111', // dark (true) + QRMatrix::M_FINDER => '#FFBFBF', // light (false) + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => '#A71111', // finder dot, dark (true) // alignment - 2560 => '#A70364', - 10 => '#FFC9C9', + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => '#A70364', + QRMatrix::M_ALIGNMENT => '#FFC9C9', // timing - 3072 => '#98005D', - 12 => '#FFB8E9', + QRMatrix::M_TIMING | QRMatrix::IS_DARK => '#98005D', + QRMatrix::M_TIMING => '#FFB8E9', // format - 3584 => '#003804', - 14 => '#00FB12', + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => '#003804', + QRMatrix::M_FORMAT => '#00FB12', // version - 4096 => '#650098', - 16 => '#E0B8FF', + QRMatrix::M_VERSION | QRMatrix::IS_DARK => '#650098', + QRMatrix::M_VERSION => '#E0B8FF', // data - 1024 => '#4A6000', - 4 => '#ECF9BE', + QRMatrix::M_DATA | QRMatrix::IS_DARK => '#4A6000', + QRMatrix::M_DATA => '#ECF9BE', // darkmodule - 512 => '#080063', + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => '#080063', // separator - 8 => '#DDDDDD', + QRMatrix::M_SEPARATOR => '#DDDDDD', // quietzone - 18 => '#DDDDDD', + QRMatrix::M_QUIETZONE => '#DDDDDD', ], ]); diff --git a/examples/svg.php b/examples/svg.php index 517e393ed..b02040dda 100644 --- a/examples/svg.php +++ b/examples/svg.php @@ -11,6 +11,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once __DIR__.'/../vendor/autoload.php'; @@ -39,29 +40,30 @@ $options = new QROptions([ ', 'moduleValues' => [ // finder - 1536 => 'url(#g1)', // dark (true) - 6 => '#fff', // light (false) + QRMatrix::M_FINDER | QRMatrix::IS_DARK => 'url(#g1)', // dark (true) + QRMatrix::M_FINDER => '#fff', // light (false) + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => 'url(#g2)', // finder dot, dark (true) // alignment - 2560 => 'url(#g1)', - 10 => '#fff', + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => 'url(#g1)', + QRMatrix::M_ALIGNMENT => '#fff', // timing - 3072 => 'url(#g1)', - 12 => '#fff', + QRMatrix::M_TIMING | QRMatrix::IS_DARK => 'url(#g1)', + QRMatrix::M_TIMING => '#fff', // format - 3584 => 'url(#g1)', - 14 => '#fff', + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => 'url(#g1)', + QRMatrix::M_FORMAT => '#fff', // version - 4096 => 'url(#g1)', - 16 => '#fff', + QRMatrix::M_VERSION | QRMatrix::IS_DARK => 'url(#g1)', + QRMatrix::M_VERSION => '#fff', // data - 1024 => 'url(#g2)', - 4 => '#fff', + QRMatrix::M_DATA | QRMatrix::IS_DARK => 'url(#g2)', + QRMatrix::M_DATA => '#fff', // darkmodule - 512 => 'url(#g1)', + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => 'url(#g1)', // separator - 8 => '#fff', + QRMatrix::M_SEPARATOR => '#fff', // quietzone - 18 => '#fff', + QRMatrix::M_QUIETZONE => '#fff', ], ]); @@ -72,7 +74,7 @@ header('Content-type: image/svg+xml'); if($gzip === true){ header('Vary: Accept-Encoding'); header('Content-Encoding: gzip'); - $qrcode = gzencode($qrcode ,9); + $qrcode = gzencode($qrcode, 9); } echo $qrcode; diff --git a/examples/text.php b/examples/text.php index d0a6ec2bc..89854db6a 100644 --- a/examples/text.php +++ b/examples/text.php @@ -11,6 +11,7 @@ namespace chillerlan\QRCodeExamples; use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Common\EccLevel; require_once __DIR__.'/../vendor/autoload.php'; @@ -34,29 +35,30 @@ $options = new QROptions([ 'eccLevel' => EccLevel::L, 'moduleValues' => [ // finder - 1536 => 'A', // dark (true) - 6 => 'a', // light (false) + QRMatrix::M_FINDER | QRMatrix::IS_DARK => 'A', // dark (true) + QRMatrix::M_FINDER => 'a', // light (false) + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => 'รค', // finder dot, dark (true) // alignment - 2560 => 'B', - 10 => 'b', + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => 'B', + QRMatrix::M_ALIGNMENT => 'b', // timing - 3072 => 'C', - 12 => 'c', + QRMatrix::M_TIMING | QRMatrix::IS_DARK => 'C', + QRMatrix::M_TIMING => 'c', // format - 3584 => 'D', - 14 => 'd', + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => 'D', + QRMatrix::M_FORMAT => 'd', // version - 4096 => 'E', - 16 => 'e', + QRMatrix::M_VERSION | QRMatrix::IS_DARK => 'E', + QRMatrix::M_VERSION => 'e', // data - 1024 => 'F', - 4 => 'f', + QRMatrix::M_DATA | QRMatrix::IS_DARK => 'F', + QRMatrix::M_DATA => 'f', // darkmodule - 512 => 'G', + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => 'G', // separator - 8 => 'h', + QRMatrix::M_SEPARATOR => 'h', // quietzone - 18 => 'i', + QRMatrix::M_QUIETZONE => 'i', ], ]); diff --git a/src/Data/QRData.php b/src/Data/QRData.php index c02d50812..6f62cdb4e 100644 --- a/src/Data/QRData.php +++ b/src/Data/QRData.php @@ -105,7 +105,8 @@ final class QRData{ return (new QRMatrix($this->version, $this->eccLevel)) ->init($maskPattern, $test) - ->mapData($data, $maskPattern) + ->mapData($data) + ->mask($maskPattern) ; } diff --git a/src/Data/QRMatrix.php b/src/Data/QRMatrix.php index 2d9f74b28..d06aa36bc 100755 --- a/src/Data/QRMatrix.php +++ b/src/Data/QRMatrix.php @@ -28,31 +28,33 @@ use function array_fill, array_push, array_unshift, floor, max, min, range; final class QRMatrix{ /** @var int */ - public const M_NULL = 0x00; + public const M_NULL = 0b000000000000; /** @var int */ - public const M_DARKMODULE = 0x02; + public const M_DARKMODULE = 0b000000000001; /** @var int */ - public const M_DATA = 0x04; + public const M_DATA = 0b000000000010; /** @var int */ - public const M_FINDER = 0x06; + public const M_FINDER = 0b000000000100; /** @var int */ - public const M_SEPARATOR = 0x08; + public const M_SEPARATOR = 0b000000001000; /** @var int */ - public const M_ALIGNMENT = 0x0a; + public const M_ALIGNMENT = 0b000000010000; /** @var int */ - public const M_TIMING = 0x0c; + public const M_TIMING = 0b000000100000; /** @var int */ - public const M_FORMAT = 0x0e; + public const M_FORMAT = 0b000001000000; /** @var int */ - public const M_VERSION = 0x10; + public const M_VERSION = 0b000010000000; /** @var int */ - public const M_QUIETZONE = 0x12; + public const M_QUIETZONE = 0b000100000000; /** @var int */ - public const M_LOGO = 0x14; + public const M_LOGO = 0b001000000000; /** @var int */ - public const M_FINDER_DOT = 0x16; + public const M_FINDER_DOT = 0b010000000000; /** @var int */ - public const M_TEST = 0xff; + public const M_TEST = 0b011111111111; + /** @var int */ + public const IS_DARK = 0b100000000000; /** * the used mask pattern, set via QRMatrix::mapData() @@ -123,7 +125,7 @@ final class QRMatrix{ $matrix[$y] = []; foreach($row as $x => $val){ - $matrix[$y][$x] = ($val >> 8) > 0; + $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK; } } @@ -170,28 +172,42 @@ final class QRMatrix{ /** * Sets the $M_TYPE value for the module at position [$x, $y] * - * true => $M_TYPE << 8 + * true => $M_TYPE | 0x800 * false => $M_TYPE */ public function set(int $x, int $y, bool $value, int $M_TYPE):QRMatrix{ - $this->matrix[$y][$x] = $M_TYPE << ($value ? 8 : 0); + $this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0); return $this; } /** - * Checks whether a module is true (dark) or false (light) - * - * true => $value >> 8 === $M_TYPE - * $value >> 8 > 0 - * - * false => $value === $M_TYPE - * $value >> 8 === 0 + * Flips the value of the module */ - public function check(int $x, int $y):bool{ - return ($this->matrix[$y][$x] >> 8) > 0; + public function flip(int $x, int $y):QRMatrix{ + $this->matrix[$y][$x] ^= $this::IS_DARK; + + return $this; } + /** + * Checks whether a module is of the given $M_TYPE + * + * true => $value & $M_TYPE === $M_TYPE + */ + public function checkType(int $x, int $y, int $M_TYPE):bool{ + return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE; + } + + /** + * Checks whether a module is true (dark) or false (light) + * + * true => $value & 0x800 === 0x800 + * false => $value & 0x800 === 0 + */ + public function check(int $x, int $y):bool{ + return $this->checkType($x, $y, $this::IS_DARK); + } /** * Sets the "dark module", that is always on the same position 1x1px away from the bottom left finder @@ -331,7 +347,7 @@ final class QRMatrix{ if($bits !== null){ for($i = 0; $i < 18; $i++){ - $a = (int)floor($i / 3); + $a = (int)($i / 3); $b = $i % 3 + $this->moduleCount - 8 - 3; $v = !$test && (($bits >> $i) & 1) === 1; @@ -495,18 +511,15 @@ final class QRMatrix{ * @see \chillerlan\QRCode\Data\QRData::maskECC() * * @param \SplFixedArray $data - * @param int $maskPattern * * @return \chillerlan\QRCode\Data\QRMatrix */ - public function mapData(SplFixedArray $data, int $maskPattern):QRMatrix{ - $this->maskPattern = $maskPattern; + public function mapData(SplFixedArray $data):QRMatrix{ $byteCount = $data->count(); $y = $this->moduleCount - 1; $inc = -1; $byteIndex = 0; $bitIndex = 7; - $mask = $this->getMask($this->maskPattern); for($i = $y; $i > 0; $i -= 2){ @@ -525,11 +538,7 @@ final class QRMatrix{ $v = (($data[$byteIndex] >> $bitIndex) & 1) === 1; } - if($mask($x, $y) === 0){ - $v = !$v; - } - - $this->matrix[$y][$x] = $this::M_DATA << ($v ? 8 : 0); + $this->matrix[$y][$x] = $this::M_DATA | ($v ? $this::IS_DARK : 0); $bitIndex--; if($bitIndex === -1){ @@ -555,6 +564,26 @@ final class QRMatrix{ return $this; } + /** + * Applies the mask pattern + * + * ISO/IEC 18004:2000 Section 8.8.1 + */ + public function mask(int $maskPattern):QRMatrix{ + $this->maskPattern = $maskPattern; + $mask = $this->getMask($this->maskPattern); + + foreach($this->matrix as $y => &$row){ + foreach($row as $x => &$val){ + if($mask($x, $y) === 0 && ($val & $this::M_DATA) === $this::M_DATA){ + $val ^= $this::IS_DARK; + } + } + } + + return $this; + } + /** * ISO/IEC 18004:2000 Section 8.8.1 * diff --git a/src/Output/QROutputInterface.php b/src/Output/QROutputInterface.php index b07b8e7a5..847b2b754 100644 --- a/src/Output/QROutputInterface.php +++ b/src/Output/QROutputInterface.php @@ -21,27 +21,27 @@ interface QROutputInterface{ const DEFAULT_MODULE_VALUES = [ // light - QRMatrix::M_NULL => false, // 0 - QRMatrix::M_DATA => false, // 4 - QRMatrix::M_FINDER => false, // 6 - QRMatrix::M_SEPARATOR => false, // 8 - QRMatrix::M_ALIGNMENT => false, // 10 - QRMatrix::M_TIMING => false, // 12 - QRMatrix::M_FORMAT => false, // 14 - QRMatrix::M_VERSION => false, // 16 - QRMatrix::M_QUIETZONE => false, // 18 - QRMatrix::M_LOGO => false, // 20 - QRMatrix::M_TEST => false, // 255 + QRMatrix::M_NULL => false, + QRMatrix::M_DATA => false, + QRMatrix::M_FINDER => false, + QRMatrix::M_SEPARATOR => false, + QRMatrix::M_ALIGNMENT => false, + QRMatrix::M_TIMING => false, + QRMatrix::M_FORMAT => false, + QRMatrix::M_VERSION => false, + QRMatrix::M_QUIETZONE => false, + QRMatrix::M_LOGO => false, + QRMatrix::M_TEST => false, // dark - QRMatrix::M_DARKMODULE << 8 => true, // 512 - QRMatrix::M_DATA << 8 => true, // 1024 - QRMatrix::M_FINDER << 8 => true, // 1536 - QRMatrix::M_ALIGNMENT << 8 => true, // 2560 - QRMatrix::M_TIMING << 8 => true, // 3072 - QRMatrix::M_FORMAT << 8 => true, // 3584 - QRMatrix::M_VERSION << 8 => true, // 4096 - QRMatrix::M_FINDER_DOT << 8 => true, // 5632 - QRMatrix::M_TEST << 8 => true, // 65280 + QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => true, + QRMatrix::M_DATA | QRMatrix::IS_DARK => true, + QRMatrix::M_FINDER | QRMatrix::IS_DARK => true, + QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK => true, + QRMatrix::M_TIMING | QRMatrix::IS_DARK => true, + QRMatrix::M_FORMAT | QRMatrix::IS_DARK => true, + QRMatrix::M_VERSION | QRMatrix::IS_DARK => true, + QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => true, + QRMatrix::M_TEST | QRMatrix::IS_DARK => true, ]; /** diff --git a/tests/Data/QRMatrixTest.php b/tests/Data/QRMatrixTest.php index 3b94b974d..53ec8ea3c 100755 --- a/tests/Data/QRMatrixTest.php +++ b/tests/Data/QRMatrixTest.php @@ -87,11 +87,11 @@ final class QRMatrixTest extends TestCase{ */ public function testGetSetCheck():void{ $this->matrix->set(10, 10, true, QRMatrix::M_TEST); - $this::assertSame(65280, $this->matrix->get(10, 10)); + $this::assertSame(QRMatrix::M_TEST | QRMatrix::IS_DARK, $this->matrix->get(10, 10)); $this::assertTrue($this->matrix->check(10, 10)); $this->matrix->set(20, 20, false, QRMatrix::M_TEST); - $this::assertSame(255, $this->matrix->get(20, 20)); + $this::assertSame(QRMatrix::M_TEST, $this->matrix->get(20, 20)); $this::assertFalse($this->matrix->check(20, 20)); } @@ -119,7 +119,7 @@ final class QRMatrixTest extends TestCase{ public function testSetDarkModule(int $version):void{ $matrix = $this->getMatrix($version)->setDarkModule(); - $this::assertSame(QRMatrix::M_DARKMODULE << 8, $matrix->get(8, $matrix->size() - 8)); + $this::assertSame(QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK, $matrix->get(8, $matrix->size() - 8)); } /** @@ -130,9 +130,9 @@ final class QRMatrixTest extends TestCase{ public function testSetFinderPattern(int $version):void{ $matrix = $this->getMatrix($version)->setFinderPattern(); - $this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get(0, 0)); - $this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get(0, $matrix->size() - 1)); - $this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get($matrix->size() - 1, 0)); + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $matrix->get(0, 0)); + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $matrix->get(0, $matrix->size() - 1)); + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $matrix->get($matrix->size() - 1, 0)); } /** @@ -174,12 +174,12 @@ final class QRMatrixTest extends TestCase{ foreach($alignmentPattern as $py){ foreach($alignmentPattern as $px){ - if($matrix->get($px, $py) === QRMatrix::M_FINDER << 8){ - $this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get($px, $py), 'skipped finder pattern'); + if($matrix->get($px, $py) === (QRMatrix::M_FINDER | QRMatrix::IS_DARK)){ + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $matrix->get($px, $py), 'skipped finder pattern'); continue; } - $this::assertSame(QRMatrix::M_ALIGNMENT << 8, $matrix->get($px, $py)); + $this::assertSame(QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK, $matrix->get($px, $py)); } } @@ -204,13 +204,13 @@ final class QRMatrixTest extends TestCase{ if($i % 2 === 0){ $p1 = $matrix->get(6, $i); - if($p1 === QRMatrix::M_ALIGNMENT << 8){ - $this::assertSame(QRMatrix::M_ALIGNMENT << 8, $p1, 'skipped alignment pattern'); + if($p1 === (QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK)){ + $this::assertSame(QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK, $p1, 'skipped alignment pattern'); continue; } - $this::assertSame(QRMatrix::M_TIMING << 8, $p1); - $this::assertSame(QRMatrix::M_TIMING << 8, $matrix->get($i, 6)); + $this::assertSame(QRMatrix::M_TIMING | QRMatrix::IS_DARK, $p1); + $this::assertSame(QRMatrix::M_TIMING | QRMatrix::IS_DARK, $matrix->get($i, 6)); } } } @@ -274,8 +274,8 @@ final class QRMatrixTest extends TestCase{ $this::assertSame(QRMatrix::M_QUIETZONE, $matrix->get(0, 0)); $this::assertSame(QRMatrix::M_QUIETZONE, $matrix->get($size - 1, $size - 1)); - $this::assertSame(QRMatrix::M_TEST << 8, $matrix->get($q, $q)); - $this::assertSame(QRMatrix::M_TEST << 8, $matrix->get($size - 1 - $q, $size - 1 - $q)); + $this::assertSame(QRMatrix::M_TEST | QRMatrix::IS_DARK, $matrix->get($q, $q)); + $this::assertSame(QRMatrix::M_TEST | QRMatrix::IS_DARK, $matrix->get($size - 1 - $q, $size - 1 - $q)); } /** @@ -319,10 +319,10 @@ final class QRMatrixTest extends TestCase{ // logo space should not overwrite quiet zone & function patterns $m->setLogoSpace(21, 21, -10, -10); $this::assertSame(QRMatrix::M_QUIETZONE, $m->get(9, 9)); - $this::assertSame(QRMatrix::M_FINDER << 8, $m->get(10, 10)); - $this::assertSame(QRMatrix::M_FINDER << 8, $m->get(16, 16)); + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $m->get(10, 10)); + $this::assertSame(QRMatrix::M_FINDER | QRMatrix::IS_DARK, $m->get(16, 16)); $this::assertSame(QRMatrix::M_SEPARATOR, $m->get(17, 17)); - $this::assertSame(QRMatrix::M_FORMAT << 8, $m->get(18, 18)); + $this::assertSame(QRMatrix::M_FORMAT | QRMatrix::IS_DARK, $m->get(18, 18)); $this::assertSame(QRMatrix::M_LOGO, $m->get(19, 19)); $this::assertSame(QRMatrix::M_LOGO, $m->get(20, 20)); $this::assertNotSame(QRMatrix::M_LOGO, $m->get(21, 21)); @@ -353,4 +353,27 @@ final class QRMatrixTest extends TestCase{ (new QRCode($o))->addByteSegment('testdata')->getMatrix()->setLogoSpace(50, 50); } + /** + * Tests flipping the value of a module + */ + public function testFlip():void{ + // using the dark module here because i'm lazy + $matrix = $this->getMatrix(10)->setDarkModule(); + $x = 8; + $y = $matrix->size() - 8; + + // cover checkType() + $this::assertTrue($matrix->checkType($x, $y, QRMatrix::M_DARKMODULE)); + // verify the current state (dark) + $this::assertSame(QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK, $matrix->get($x, $y)); + // flip + $matrix->flip($x, $y); + // verify flip + $this::assertSame(QRMatrix::M_DARKMODULE, $matrix->get($x, $y)); + // flip again + $matrix->flip($x, $y); + // verify flip + $this::assertSame(QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK, $matrix->get($x, $y)); + } + } diff --git a/tests/Output/QRMarkupTest.php b/tests/Output/QRMarkupTest.php index cc18077d5..b928c5062 100644 --- a/tests/Output/QRMarkupTest.php +++ b/tests/Output/QRMarkupTest.php @@ -12,7 +12,7 @@ namespace chillerlan\QRCodeTest\Output; -use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\{Data\QRMatrix, QRCode, QROptions}; use chillerlan\QRCode\Output\{QROutputInterface, QRMarkup}; /** @@ -46,8 +46,8 @@ class QRMarkupTest extends QROutputTestAbstract{ $this->options->imageBase64 = false; $this->options->moduleValues = [ // data - 1024 => '#4A6000', - 4 => '#ECF9BE', + QRMatrix::M_DATA | QRMatrix::IS_DARK => '#4A6000', + QRMatrix::M_DATA => '#ECF9BE', ]; $this->outputInterface = $this->getOutputInterface($this->options); diff --git a/tests/Output/QRStringTest.php b/tests/Output/QRStringTest.php index 9206c8f10..c40694ec8 100644 --- a/tests/Output/QRStringTest.php +++ b/tests/Output/QRStringTest.php @@ -12,9 +12,11 @@ namespace chillerlan\QRCodeTest\Output; -use chillerlan\QRCodeExamples\MyCustomOutput; -use chillerlan\QRCode\{Common\EccLevel, QRCode, QROptions}; +use chillerlan\QRCode\{QRCode, QROptions}; +use chillerlan\QRCode\Common\EccLevel; +use chillerlan\QRCode\Data\QRMatrix; use chillerlan\QRCode\Output\{QROutputInterface, QRString}; +use chillerlan\QRCodeExamples\MyCustomOutput; /** * Tests the QRString output module @@ -47,8 +49,8 @@ class QRStringTest extends QROutputTestAbstract{ $this->options->moduleValues = [ // data - 1024 => 'A', - 4 => 'B', + QRMatrix::M_DATA | QRMatrix::IS_DARK => 'A', + QRMatrix::M_DATA => 'B', ]; $this->outputInterface = $this->getOutputInterface($this->options); diff --git a/tests/Output/samples/json b/tests/Output/samples/json index f8423f75b..56837ea1b 100644 --- a/tests/Output/samples/json +++ b/tests/Output/samples/json @@ -1 +1 @@ -[[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,1536,1536,1536,1536,1536,1536,1536,8,3584,1024,4,4,1024,8,1536,1536,1536,1536,1536,1536,1536,18,18,18,18],[18,18,18,18,1536,6,6,6,6,6,1536,8,14,1024,4,4,1024,8,1536,6,6,6,6,6,1536,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,3584,4,1024,4,1024,8,1536,6,5632,5632,5632,6,1536,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,3584,4,4,1024,4,8,1536,6,5632,5632,5632,6,1536,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,3584,1024,1024,4,4,8,1536,6,5632,5632,5632,6,1536,18,18,18,18],[18,18,18,18,1536,6,6,6,6,6,1536,8,14,4,4,4,4,8,1536,6,6,6,6,6,1536,18,18,18,18],[18,18,18,18,1536,1536,1536,1536,1536,1536,1536,8,3072,12,3072,12,3072,8,1536,1536,1536,1536,1536,1536,1536,18,18,18,18],[18,18,18,18,8,8,8,8,8,8,8,8,14,1024,1024,4,4,8,8,8,8,8,8,8,8,18,18,18,18],[18,18,18,18,3584,3584,3584,3584,14,14,3072,14,3584,4,1024,4,4,3584,14,14,3584,3584,3584,14,3584,18,18,18,18],[18,18,18,18,1024,4,4,1024,1024,1024,12,1024,4,4,1024,4,1024,4,4,1024,4,1024,1024,4,1024,18,18,18,18],[18,18,18,18,1024,4,1024,4,1024,1024,3072,4,4,4,1024,4,1024,1024,1024,1024,1024,4,4,1024,1024,18,18,18,18],[18,18,18,18,1024,4,1024,1024,4,4,12,1024,1024,4,1024,4,1024,1024,4,4,4,1024,4,1024,4,18,18,18,18],[18,18,18,18,4,1024,1024,4,1024,4,3072,4,4,1024,1024,1024,4,1024,4,4,1024,1024,4,1024,4,18,18,18,18],[18,18,18,18,8,8,8,8,8,8,8,8,512,4,1024,4,4,1024,4,1024,4,1024,4,1024,4,18,18,18,18],[18,18,18,18,1536,1536,1536,1536,1536,1536,1536,8,14,4,1024,4,4,1024,1024,4,1024,1024,1024,4,4,18,18,18,18],[18,18,18,18,1536,6,6,6,6,6,1536,8,14,1024,4,1024,1024,1024,1024,4,4,1024,1024,4,4,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,14,1024,1024,1024,4,4,1024,4,4,4,1024,1024,1024,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,3584,1024,4,4,4,1024,4,4,1024,1024,4,1024,4,18,18,18,18],[18,18,18,18,1536,6,5632,5632,5632,6,1536,8,3584,4,1024,1024,4,1024,4,4,1024,4,1024,4,4,18,18,18,18],[18,18,18,18,1536,6,6,6,6,6,1536,8,3584,1024,1024,1024,1024,4,1024,4,1024,1024,4,4,1024,18,18,18,18],[18,18,18,18,1536,1536,1536,1536,1536,1536,1536,8,3584,1024,4,1024,1024,4,4,1024,4,4,4,4,4,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18]] +[[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,2052,2052,2052,2052,2052,2052,2052,8,2112,2050,2,2,2050,8,2052,2052,2052,2052,2052,2052,2052,256,256,256,256],[256,256,256,256,2052,4,4,4,4,4,2052,8,64,2050,2,2,2050,8,2052,4,4,4,4,4,2052,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,2112,2,2050,2,2050,8,2052,4,3072,3072,3072,4,2052,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,2112,2,2,2050,2,8,2052,4,3072,3072,3072,4,2052,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,2112,2050,2050,2,2,8,2052,4,3072,3072,3072,4,2052,256,256,256,256],[256,256,256,256,2052,4,4,4,4,4,2052,8,64,2,2,2,2,8,2052,4,4,4,4,4,2052,256,256,256,256],[256,256,256,256,2052,2052,2052,2052,2052,2052,2052,8,2080,32,2080,32,2080,8,2052,2052,2052,2052,2052,2052,2052,256,256,256,256],[256,256,256,256,8,8,8,8,8,8,8,8,64,2050,2050,2,2,8,8,8,8,8,8,8,8,256,256,256,256],[256,256,256,256,2112,2112,2112,2112,64,64,2080,64,2112,2,2050,2,2,2112,64,64,2112,2112,2112,64,2112,256,256,256,256],[256,256,256,256,2050,2,2,2050,2050,2050,32,2050,2,2,2050,2,2050,2,2,2050,2,2050,2050,2,2050,256,256,256,256],[256,256,256,256,2050,2,2050,2,2050,2050,2080,2,2,2,2050,2,2050,2050,2050,2050,2050,2,2,2050,2050,256,256,256,256],[256,256,256,256,2050,2,2050,2050,2,2,32,2050,2050,2,2050,2,2050,2050,2,2,2,2050,2,2050,2,256,256,256,256],[256,256,256,256,2,2050,2050,2,2050,2,2080,2,2,2050,2050,2050,2,2050,2,2,2050,2050,2,2050,2,256,256,256,256],[256,256,256,256,8,8,8,8,8,8,8,8,2049,2,2050,2,2,2050,2,2050,2,2050,2,2050,2,256,256,256,256],[256,256,256,256,2052,2052,2052,2052,2052,2052,2052,8,64,2,2050,2,2,2050,2050,2,2050,2050,2050,2,2,256,256,256,256],[256,256,256,256,2052,4,4,4,4,4,2052,8,64,2050,2,2050,2050,2050,2050,2,2,2050,2050,2,2,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,64,2050,2050,2050,2,2,2050,2,2,2,2050,2050,2050,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,2112,2050,2,2,2,2050,2,2,2050,2050,2,2050,2,256,256,256,256],[256,256,256,256,2052,4,3072,3072,3072,4,2052,8,2112,2,2050,2050,2,2050,2,2,2050,2,2050,2,2,256,256,256,256],[256,256,256,256,2052,4,4,4,4,4,2052,8,2112,2050,2050,2050,2050,2,2050,2,2050,2050,2,2,2050,256,256,256,256],[256,256,256,256,2052,2052,2052,2052,2052,2052,2052,8,2112,2050,2,2050,2050,2,2,2050,2,2,2,2,2,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256],[256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256]] diff --git a/tests/Output/samples/svg b/tests/Output/samples/svg index 54aceb9ec..10d895a93 100644 --- a/tests/Output/samples/svg +++ b/tests/Output/samples/svg @@ -1 +1 @@ -data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" class="qr-svg " style="width: 100%; height: auto;" viewBox="0 0 29 29">
<defs><style>rect{shape-rendering:crispEdges}</style></defs>
<path class="qr-4 " stroke="transparent" fill="#fff" fill-opacity="1" d="M14 4 h2 v1 h-2Z M14 5 h2 v1 h-2Z M13 6 h1 v1 h-1Z M15 6 h1 v1 h-1Z M13 7 h2 v1 h-2Z M16 7 h1 v1 h-1Z M15 8 h2 v1 h-2Z M13 9 h4 v1 h-4Z M15 11 h2 v1 h-2Z M13 12 h1 v1 h-1Z M15 12 h2 v1 h-2Z M5 13 h2 v1 h-2Z M12 13 h2 v1 h-2Z M15 13 h1 v1 h-1Z M17 13 h2 v1 h-2Z M20 13 h1 v1 h-1Z M23 13 h1 v1 h-1Z M5 14 h1 v1 h-1Z M7 14 h1 v1 h-1Z M11 14 h3 v1 h-3Z M15 14 h1 v1 h-1Z M21 14 h2 v1 h-2Z M5 15 h1 v1 h-1Z M8 15 h2 v1 h-2Z M13 15 h1 v1 h-1Z M15 15 h1 v1 h-1Z M18 15 h3 v1 h-3Z M22 15 h1 v1 h-1Z M24 15 h1 v1 h-1Z M4 16 h1 v1 h-1Z M7 16 h1 v1 h-1Z M9 16 h1 v1 h-1Z M11 16 h2 v1 h-2Z M16 16 h1 v1 h-1Z M18 16 h2 v1 h-2Z M22 16 h1 v1 h-1Z M24 16 h1 v1 h-1Z M13 17 h1 v1 h-1Z M15 17 h2 v1 h-2Z M18 17 h1 v1 h-1Z M20 17 h1 v1 h-1Z M22 17 h1 v1 h-1Z M24 17 h1 v1 h-1Z M13 18 h1 v1 h-1Z M15 18 h2 v1 h-2Z M19 18 h1 v1 h-1Z M23 18 h2 v1 h-2Z M14 19 h1 v1 h-1Z M19 19 h2 v1 h-2Z M23 19 h2 v1 h-2Z M16 20 h2 v1 h-2Z M19 20 h3 v1 h-3Z M14 21 h3 v1 h-3Z M18 21 h2 v1 h-2Z M22 21 h1 v1 h-1Z M24 21 h1 v1 h-1Z M13 22 h1 v1 h-1Z M16 22 h1 v1 h-1Z M18 22 h2 v1 h-2Z M21 22 h1 v1 h-1Z M23 22 h2 v1 h-2Z M17 23 h1 v1 h-1Z M19 23 h1 v1 h-1Z M22 23 h2 v1 h-2Z M14 24 h1 v1 h-1Z M17 24 h2 v1 h-2Z M20 24 h5 v1 h-5Z " /><path class="qr-6 " stroke="transparent" fill="#fff" fill-opacity="1" d="M5 5 h5 v1 h-5Z M19 5 h5 v1 h-5Z M5 6 h1 v1 h-1Z M9 6 h1 v1 h-1Z M19 6 h1 v1 h-1Z M23 6 h1 v1 h-1Z M5 7 h1 v1 h-1Z M9 7 h1 v1 h-1Z M19 7 h1 v1 h-1Z M23 7 h1 v1 h-1Z M5 8 h1 v1 h-1Z M9 8 h1 v1 h-1Z M19 8 h1 v1 h-1Z M23 8 h1 v1 h-1Z M5 9 h5 v1 h-5Z M19 9 h5 v1 h-5Z M5 19 h5 v1 h-5Z M5 20 h1 v1 h-1Z M9 20 h1 v1 h-1Z M5 21 h1 v1 h-1Z M9 21 h1 v1 h-1Z M5 22 h1 v1 h-1Z M9 22 h1 v1 h-1Z M5 23 h5 v1 h-5Z " /><path class="qr-8 " stroke="transparent" fill="#fff" fill-opacity="1" d="M11 4 h1 v1 h-1Z M17 4 h1 v1 h-1Z M11 5 h1 v1 h-1Z M17 5 h1 v1 h-1Z M11 6 h1 v1 h-1Z M17 6 h1 v1 h-1Z M11 7 h1 v1 h-1Z M17 7 h1 v1 h-1Z M11 8 h1 v1 h-1Z M17 8 h1 v1 h-1Z M11 9 h1 v1 h-1Z M17 9 h1 v1 h-1Z M11 10 h1 v1 h-1Z M17 10 h1 v1 h-1Z M4 11 h8 v1 h-8Z M17 11 h8 v1 h-8Z M4 17 h8 v1 h-8Z M11 18 h1 v1 h-1Z M11 19 h1 v1 h-1Z M11 20 h1 v1 h-1Z M11 21 h1 v1 h-1Z M11 22 h1 v1 h-1Z M11 23 h1 v1 h-1Z M11 24 h1 v1 h-1Z " /><path class="qr-12 " stroke="transparent" fill="#fff" fill-opacity="1" d="M13 10 h1 v1 h-1Z M15 10 h1 v1 h-1Z M10 13 h1 v1 h-1Z M10 15 h1 v1 h-1Z " /><path class="qr-14 " stroke="transparent" fill="#fff" fill-opacity="1" d="M12 5 h1 v1 h-1Z M12 9 h1 v1 h-1Z M12 11 h1 v1 h-1Z M8 12 h2 v1 h-2Z M11 12 h1 v1 h-1Z M18 12 h2 v1 h-2Z M23 12 h1 v1 h-1Z M12 18 h1 v1 h-1Z M12 19 h1 v1 h-1Z M12 20 h1 v1 h-1Z " /><path class="qr-18 " stroke="transparent" fill="#fff" fill-opacity="1" d="M0 0 h29 v1 h-29Z M0 1 h29 v1 h-29Z M0 2 h29 v1 h-29Z M0 3 h29 v1 h-29Z M0 4 h4 v1 h-4Z M25 4 h4 v1 h-4Z M0 5 h4 v1 h-4Z M25 5 h4 v1 h-4Z M0 6 h4 v1 h-4Z M25 6 h4 v1 h-4Z M0 7 h4 v1 h-4Z M25 7 h4 v1 h-4Z M0 8 h4 v1 h-4Z M25 8 h4 v1 h-4Z M0 9 h4 v1 h-4Z M25 9 h4 v1 h-4Z M0 10 h4 v1 h-4Z M25 10 h4 v1 h-4Z M0 11 h4 v1 h-4Z M25 11 h4 v1 h-4Z M0 12 h4 v1 h-4Z M25 12 h4 v1 h-4Z M0 13 h4 v1 h-4Z M25 13 h4 v1 h-4Z M0 14 h4 v1 h-4Z M25 14 h4 v1 h-4Z M0 15 h4 v1 h-4Z M25 15 h4 v1 h-4Z M0 16 h4 v1 h-4Z M25 16 h4 v1 h-4Z M0 17 h4 v1 h-4Z M25 17 h4 v1 h-4Z M0 18 h4 v1 h-4Z M25 18 h4 v1 h-4Z M0 19 h4 v1 h-4Z M25 19 h4 v1 h-4Z M0 20 h4 v1 h-4Z M25 20 h4 v1 h-4Z M0 21 h4 v1 h-4Z M25 21 h4 v1 h-4Z M0 22 h4 v1 h-4Z M25 22 h4 v1 h-4Z M0 23 h4 v1 h-4Z M25 23 h4 v1 h-4Z M0 24 h4 v1 h-4Z M25 24 h4 v1 h-4Z M0 25 h29 v1 h-29Z M0 26 h29 v1 h-29Z M0 27 h29 v1 h-29Z M0 28 h29 v1 h-29Z " /><path class="qr-512 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 17 h1 v1 h-1Z " /><path class="qr-1024 " stroke="transparent" fill="#000" fill-opacity="1" d="M13 4 h1 v1 h-1Z M16 4 h1 v1 h-1Z M13 5 h1 v1 h-1Z M16 5 h1 v1 h-1Z M14 6 h1 v1 h-1Z M16 6 h1 v1 h-1Z M15 7 h1 v1 h-1Z M13 8 h2 v1 h-2Z M13 11 h2 v1 h-2Z M14 12 h1 v1 h-1Z M4 13 h1 v1 h-1Z M7 13 h3 v1 h-3Z M11 13 h1 v1 h-1Z M14 13 h1 v1 h-1Z M16 13 h1 v1 h-1Z M19 13 h1 v1 h-1Z M21 13 h2 v1 h-2Z M24 13 h1 v1 h-1Z M4 14 h1 v1 h-1Z M6 14 h1 v1 h-1Z M8 14 h2 v1 h-2Z M14 14 h1 v1 h-1Z M16 14 h5 v1 h-5Z M23 14 h2 v1 h-2Z M4 15 h1 v1 h-1Z M6 15 h2 v1 h-2Z M11 15 h2 v1 h-2Z M14 15 h1 v1 h-1Z M16 15 h2 v1 h-2Z M21 15 h1 v1 h-1Z M23 15 h1 v1 h-1Z M5 16 h2 v1 h-2Z M8 16 h1 v1 h-1Z M13 16 h3 v1 h-3Z M17 16 h1 v1 h-1Z M20 16 h2 v1 h-2Z M23 16 h1 v1 h-1Z M14 17 h1 v1 h-1Z M17 17 h1 v1 h-1Z M19 17 h1 v1 h-1Z M21 17 h1 v1 h-1Z M23 17 h1 v1 h-1Z M14 18 h1 v1 h-1Z M17 18 h2 v1 h-2Z M20 18 h3 v1 h-3Z M13 19 h1 v1 h-1Z M15 19 h4 v1 h-4Z M21 19 h2 v1 h-2Z M13 20 h3 v1 h-3Z M18 20 h1 v1 h-1Z M22 20 h3 v1 h-3Z M13 21 h1 v1 h-1Z M17 21 h1 v1 h-1Z M20 21 h2 v1 h-2Z M23 21 h1 v1 h-1Z M14 22 h2 v1 h-2Z M17 22 h1 v1 h-1Z M20 22 h1 v1 h-1Z M22 22 h1 v1 h-1Z M13 23 h4 v1 h-4Z M18 23 h1 v1 h-1Z M20 23 h2 v1 h-2Z M24 23 h1 v1 h-1Z M13 24 h1 v1 h-1Z M15 24 h2 v1 h-2Z M19 24 h1 v1 h-1Z " /><path class="qr-1536 " stroke="transparent" fill="#000" fill-opacity="1" d="M4 4 h7 v1 h-7Z M18 4 h7 v1 h-7Z M4 5 h1 v1 h-1Z M10 5 h1 v1 h-1Z M18 5 h1 v1 h-1Z M24 5 h1 v1 h-1Z M4 6 h1 v1 h-1Z M10 6 h1 v1 h-1Z M18 6 h1 v1 h-1Z M24 6 h1 v1 h-1Z M4 7 h1 v1 h-1Z M10 7 h1 v1 h-1Z M18 7 h1 v1 h-1Z M24 7 h1 v1 h-1Z M4 8 h1 v1 h-1Z M10 8 h1 v1 h-1Z M18 8 h1 v1 h-1Z M24 8 h1 v1 h-1Z M4 9 h1 v1 h-1Z M10 9 h1 v1 h-1Z M18 9 h1 v1 h-1Z M24 9 h1 v1 h-1Z M4 10 h7 v1 h-7Z M18 10 h7 v1 h-7Z M4 18 h7 v1 h-7Z M4 19 h1 v1 h-1Z M10 19 h1 v1 h-1Z M4 20 h1 v1 h-1Z M10 20 h1 v1 h-1Z M4 21 h1 v1 h-1Z M10 21 h1 v1 h-1Z M4 22 h1 v1 h-1Z M10 22 h1 v1 h-1Z M4 23 h1 v1 h-1Z M10 23 h1 v1 h-1Z M4 24 h7 v1 h-7Z " /><path class="qr-3072 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 10 h1 v1 h-1Z M14 10 h1 v1 h-1Z M16 10 h1 v1 h-1Z M10 12 h1 v1 h-1Z M10 14 h1 v1 h-1Z M10 16 h1 v1 h-1Z " /><path class="qr-3584 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 4 h1 v1 h-1Z M12 6 h1 v1 h-1Z M12 7 h1 v1 h-1Z M12 8 h1 v1 h-1Z M4 12 h4 v1 h-4Z M12 12 h1 v1 h-1Z M17 12 h1 v1 h-1Z M20 12 h3 v1 h-3Z M24 12 h1 v1 h-1Z M12 21 h1 v1 h-1Z M12 22 h1 v1 h-1Z M12 23 h1 v1 h-1Z M12 24 h1 v1 h-1Z " /><path class="qr-5632 " stroke="transparent" fill="#000" fill-opacity="1" d="M6 6 h3 v1 h-3Z M20 6 h3 v1 h-3Z M6 7 h3 v1 h-3Z M20 7 h3 v1 h-3Z M6 8 h3 v1 h-3Z M20 8 h3 v1 h-3Z M6 20 h3 v1 h-3Z M6 21 h3 v1 h-3Z M6 22 h3 v1 h-3Z " /></svg>
 +data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" class="qr-svg " style="width: 100%; height: auto;" viewBox="0 0 29 29">
<defs><style>rect{shape-rendering:crispEdges}</style></defs>
<path class="qr-2 " stroke="transparent" fill="#fff" fill-opacity="1" d="M14 4 h2 v1 h-2Z M14 5 h2 v1 h-2Z M13 6 h1 v1 h-1Z M15 6 h1 v1 h-1Z M13 7 h2 v1 h-2Z M16 7 h1 v1 h-1Z M15 8 h2 v1 h-2Z M13 9 h4 v1 h-4Z M15 11 h2 v1 h-2Z M13 12 h1 v1 h-1Z M15 12 h2 v1 h-2Z M5 13 h2 v1 h-2Z M12 13 h2 v1 h-2Z M15 13 h1 v1 h-1Z M17 13 h2 v1 h-2Z M20 13 h1 v1 h-1Z M23 13 h1 v1 h-1Z M5 14 h1 v1 h-1Z M7 14 h1 v1 h-1Z M11 14 h3 v1 h-3Z M15 14 h1 v1 h-1Z M21 14 h2 v1 h-2Z M5 15 h1 v1 h-1Z M8 15 h2 v1 h-2Z M13 15 h1 v1 h-1Z M15 15 h1 v1 h-1Z M18 15 h3 v1 h-3Z M22 15 h1 v1 h-1Z M24 15 h1 v1 h-1Z M4 16 h1 v1 h-1Z M7 16 h1 v1 h-1Z M9 16 h1 v1 h-1Z M11 16 h2 v1 h-2Z M16 16 h1 v1 h-1Z M18 16 h2 v1 h-2Z M22 16 h1 v1 h-1Z M24 16 h1 v1 h-1Z M13 17 h1 v1 h-1Z M15 17 h2 v1 h-2Z M18 17 h1 v1 h-1Z M20 17 h1 v1 h-1Z M22 17 h1 v1 h-1Z M24 17 h1 v1 h-1Z M13 18 h1 v1 h-1Z M15 18 h2 v1 h-2Z M19 18 h1 v1 h-1Z M23 18 h2 v1 h-2Z M14 19 h1 v1 h-1Z M19 19 h2 v1 h-2Z M23 19 h2 v1 h-2Z M16 20 h2 v1 h-2Z M19 20 h3 v1 h-3Z M14 21 h3 v1 h-3Z M18 21 h2 v1 h-2Z M22 21 h1 v1 h-1Z M24 21 h1 v1 h-1Z M13 22 h1 v1 h-1Z M16 22 h1 v1 h-1Z M18 22 h2 v1 h-2Z M21 22 h1 v1 h-1Z M23 22 h2 v1 h-2Z M17 23 h1 v1 h-1Z M19 23 h1 v1 h-1Z M22 23 h2 v1 h-2Z M14 24 h1 v1 h-1Z M17 24 h2 v1 h-2Z M20 24 h5 v1 h-5Z " /><path class="qr-4 " stroke="transparent" fill="#fff" fill-opacity="1" d="M5 5 h5 v1 h-5Z M19 5 h5 v1 h-5Z M5 6 h1 v1 h-1Z M9 6 h1 v1 h-1Z M19 6 h1 v1 h-1Z M23 6 h1 v1 h-1Z M5 7 h1 v1 h-1Z M9 7 h1 v1 h-1Z M19 7 h1 v1 h-1Z M23 7 h1 v1 h-1Z M5 8 h1 v1 h-1Z M9 8 h1 v1 h-1Z M19 8 h1 v1 h-1Z M23 8 h1 v1 h-1Z M5 9 h5 v1 h-5Z M19 9 h5 v1 h-5Z M5 19 h5 v1 h-5Z M5 20 h1 v1 h-1Z M9 20 h1 v1 h-1Z M5 21 h1 v1 h-1Z M9 21 h1 v1 h-1Z M5 22 h1 v1 h-1Z M9 22 h1 v1 h-1Z M5 23 h5 v1 h-5Z " /><path class="qr-8 " stroke="transparent" fill="#fff" fill-opacity="1" d="M11 4 h1 v1 h-1Z M17 4 h1 v1 h-1Z M11 5 h1 v1 h-1Z M17 5 h1 v1 h-1Z M11 6 h1 v1 h-1Z M17 6 h1 v1 h-1Z M11 7 h1 v1 h-1Z M17 7 h1 v1 h-1Z M11 8 h1 v1 h-1Z M17 8 h1 v1 h-1Z M11 9 h1 v1 h-1Z M17 9 h1 v1 h-1Z M11 10 h1 v1 h-1Z M17 10 h1 v1 h-1Z M4 11 h8 v1 h-8Z M17 11 h8 v1 h-8Z M4 17 h8 v1 h-8Z M11 18 h1 v1 h-1Z M11 19 h1 v1 h-1Z M11 20 h1 v1 h-1Z M11 21 h1 v1 h-1Z M11 22 h1 v1 h-1Z M11 23 h1 v1 h-1Z M11 24 h1 v1 h-1Z " /><path class="qr-32 " stroke="transparent" fill="#fff" fill-opacity="1" d="M13 10 h1 v1 h-1Z M15 10 h1 v1 h-1Z M10 13 h1 v1 h-1Z M10 15 h1 v1 h-1Z " /><path class="qr-64 " stroke="transparent" fill="#fff" fill-opacity="1" d="M12 5 h1 v1 h-1Z M12 9 h1 v1 h-1Z M12 11 h1 v1 h-1Z M8 12 h2 v1 h-2Z M11 12 h1 v1 h-1Z M18 12 h2 v1 h-2Z M23 12 h1 v1 h-1Z M12 18 h1 v1 h-1Z M12 19 h1 v1 h-1Z M12 20 h1 v1 h-1Z " /><path class="qr-256 " stroke="transparent" fill="#fff" fill-opacity="1" d="M0 0 h29 v1 h-29Z M0 1 h29 v1 h-29Z M0 2 h29 v1 h-29Z M0 3 h29 v1 h-29Z M0 4 h4 v1 h-4Z M25 4 h4 v1 h-4Z M0 5 h4 v1 h-4Z M25 5 h4 v1 h-4Z M0 6 h4 v1 h-4Z M25 6 h4 v1 h-4Z M0 7 h4 v1 h-4Z M25 7 h4 v1 h-4Z M0 8 h4 v1 h-4Z M25 8 h4 v1 h-4Z M0 9 h4 v1 h-4Z M25 9 h4 v1 h-4Z M0 10 h4 v1 h-4Z M25 10 h4 v1 h-4Z M0 11 h4 v1 h-4Z M25 11 h4 v1 h-4Z M0 12 h4 v1 h-4Z M25 12 h4 v1 h-4Z M0 13 h4 v1 h-4Z M25 13 h4 v1 h-4Z M0 14 h4 v1 h-4Z M25 14 h4 v1 h-4Z M0 15 h4 v1 h-4Z M25 15 h4 v1 h-4Z M0 16 h4 v1 h-4Z M25 16 h4 v1 h-4Z M0 17 h4 v1 h-4Z M25 17 h4 v1 h-4Z M0 18 h4 v1 h-4Z M25 18 h4 v1 h-4Z M0 19 h4 v1 h-4Z M25 19 h4 v1 h-4Z M0 20 h4 v1 h-4Z M25 20 h4 v1 h-4Z M0 21 h4 v1 h-4Z M25 21 h4 v1 h-4Z M0 22 h4 v1 h-4Z M25 22 h4 v1 h-4Z M0 23 h4 v1 h-4Z M25 23 h4 v1 h-4Z M0 24 h4 v1 h-4Z M25 24 h4 v1 h-4Z M0 25 h29 v1 h-29Z M0 26 h29 v1 h-29Z M0 27 h29 v1 h-29Z M0 28 h29 v1 h-29Z " /><path class="qr-2049 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 17 h1 v1 h-1Z " /><path class="qr-2050 " stroke="transparent" fill="#000" fill-opacity="1" d="M13 4 h1 v1 h-1Z M16 4 h1 v1 h-1Z M13 5 h1 v1 h-1Z M16 5 h1 v1 h-1Z M14 6 h1 v1 h-1Z M16 6 h1 v1 h-1Z M15 7 h1 v1 h-1Z M13 8 h2 v1 h-2Z M13 11 h2 v1 h-2Z M14 12 h1 v1 h-1Z M4 13 h1 v1 h-1Z M7 13 h3 v1 h-3Z M11 13 h1 v1 h-1Z M14 13 h1 v1 h-1Z M16 13 h1 v1 h-1Z M19 13 h1 v1 h-1Z M21 13 h2 v1 h-2Z M24 13 h1 v1 h-1Z M4 14 h1 v1 h-1Z M6 14 h1 v1 h-1Z M8 14 h2 v1 h-2Z M14 14 h1 v1 h-1Z M16 14 h5 v1 h-5Z M23 14 h2 v1 h-2Z M4 15 h1 v1 h-1Z M6 15 h2 v1 h-2Z M11 15 h2 v1 h-2Z M14 15 h1 v1 h-1Z M16 15 h2 v1 h-2Z M21 15 h1 v1 h-1Z M23 15 h1 v1 h-1Z M5 16 h2 v1 h-2Z M8 16 h1 v1 h-1Z M13 16 h3 v1 h-3Z M17 16 h1 v1 h-1Z M20 16 h2 v1 h-2Z M23 16 h1 v1 h-1Z M14 17 h1 v1 h-1Z M17 17 h1 v1 h-1Z M19 17 h1 v1 h-1Z M21 17 h1 v1 h-1Z M23 17 h1 v1 h-1Z M14 18 h1 v1 h-1Z M17 18 h2 v1 h-2Z M20 18 h3 v1 h-3Z M13 19 h1 v1 h-1Z M15 19 h4 v1 h-4Z M21 19 h2 v1 h-2Z M13 20 h3 v1 h-3Z M18 20 h1 v1 h-1Z M22 20 h3 v1 h-3Z M13 21 h1 v1 h-1Z M17 21 h1 v1 h-1Z M20 21 h2 v1 h-2Z M23 21 h1 v1 h-1Z M14 22 h2 v1 h-2Z M17 22 h1 v1 h-1Z M20 22 h1 v1 h-1Z M22 22 h1 v1 h-1Z M13 23 h4 v1 h-4Z M18 23 h1 v1 h-1Z M20 23 h2 v1 h-2Z M24 23 h1 v1 h-1Z M13 24 h1 v1 h-1Z M15 24 h2 v1 h-2Z M19 24 h1 v1 h-1Z " /><path class="qr-2052 " stroke="transparent" fill="#000" fill-opacity="1" d="M4 4 h7 v1 h-7Z M18 4 h7 v1 h-7Z M4 5 h1 v1 h-1Z M10 5 h1 v1 h-1Z M18 5 h1 v1 h-1Z M24 5 h1 v1 h-1Z M4 6 h1 v1 h-1Z M10 6 h1 v1 h-1Z M18 6 h1 v1 h-1Z M24 6 h1 v1 h-1Z M4 7 h1 v1 h-1Z M10 7 h1 v1 h-1Z M18 7 h1 v1 h-1Z M24 7 h1 v1 h-1Z M4 8 h1 v1 h-1Z M10 8 h1 v1 h-1Z M18 8 h1 v1 h-1Z M24 8 h1 v1 h-1Z M4 9 h1 v1 h-1Z M10 9 h1 v1 h-1Z M18 9 h1 v1 h-1Z M24 9 h1 v1 h-1Z M4 10 h7 v1 h-7Z M18 10 h7 v1 h-7Z M4 18 h7 v1 h-7Z M4 19 h1 v1 h-1Z M10 19 h1 v1 h-1Z M4 20 h1 v1 h-1Z M10 20 h1 v1 h-1Z M4 21 h1 v1 h-1Z M10 21 h1 v1 h-1Z M4 22 h1 v1 h-1Z M10 22 h1 v1 h-1Z M4 23 h1 v1 h-1Z M10 23 h1 v1 h-1Z M4 24 h7 v1 h-7Z " /><path class="qr-2080 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 10 h1 v1 h-1Z M14 10 h1 v1 h-1Z M16 10 h1 v1 h-1Z M10 12 h1 v1 h-1Z M10 14 h1 v1 h-1Z M10 16 h1 v1 h-1Z " /><path class="qr-2112 " stroke="transparent" fill="#000" fill-opacity="1" d="M12 4 h1 v1 h-1Z M12 6 h1 v1 h-1Z M12 7 h1 v1 h-1Z M12 8 h1 v1 h-1Z M4 12 h4 v1 h-4Z M12 12 h1 v1 h-1Z M17 12 h1 v1 h-1Z M20 12 h3 v1 h-3Z M24 12 h1 v1 h-1Z M12 21 h1 v1 h-1Z M12 22 h1 v1 h-1Z M12 23 h1 v1 h-1Z M12 24 h1 v1 h-1Z " /><path class="qr-3072 " stroke="transparent" fill="#000" fill-opacity="1" d="M6 6 h3 v1 h-3Z M20 6 h3 v1 h-3Z M6 7 h3 v1 h-3Z M20 7 h3 v1 h-3Z M6 8 h3 v1 h-3Z M20 8 h3 v1 h-3Z M6 20 h3 v1 h-3Z M6 21 h3 v1 h-3Z M6 22 h3 v1 h-3Z " /></svg>
