Fix: QRcode must not be random

This commit is contained in:
Laurent Destailleur 2015-12-20 21:28:05 +01:00
parent f243b5230f
commit 2f8fc05cdb
2 changed files with 9 additions and 2 deletions

View File

@ -62,6 +62,13 @@ In htdocs/includes/tcpdf/tcpdf.php
* Renamed getmypid into dol_getmypid(). * Renamed getmypid into dol_getmypid().
To avoid to have QRcode changed because generated with a random mask, replace
define('QR_FIND_FROM_RANDOM', 2);
with
define('QR_FIND_FROM_RANDOM', false);
TCPDI: TCPDI:
------ ------
Add fpdf_tpl.php 1.2 Add fpdf_tpl.php 1.2

View File

@ -236,7 +236,7 @@ if (!defined('QRCODEDEFS')) {
/** /**
* if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly * if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
*/ */
define('QR_FIND_FROM_RANDOM', 2); define('QR_FIND_FROM_RANDOM', false);
/** /**
* when QR_FIND_BEST_MASK === false * when QR_FIND_BEST_MASK === false
@ -730,7 +730,7 @@ class QRcode {
$this->eccLength = $this->rsEccLength($spec); $this->eccLength = $this->rsEccLength($spec);
$this->ecccode = array_fill(0, $this->eccLength, 0); $this->ecccode = array_fill(0, $this->eccLength, 0);
$this->blocks = $this->rsBlockNum($spec); $this->blocks = $this->rsBlockNum($spec);
$ret = $this->init($spec); $ret = $this->init($spec);
if ($ret < 0) { if ($ret < 0) {
return NULL; return NULL;
} }