Some optimizations

Author: Ruslan Yarullin

lib/Binarizer.php

@@ -37,6 +37,9 @@ protected function __construct($source)
         $this->source = $source;
     }
 
+    /**
+     * @return LuminanceSource
+     */
     public final function getLuminanceSource()
     {
         return $this->source;
@@ -54,7 +57,7 @@ public final function getLuminanceSource()
      * @param row An optional preallocated array. If null or too small, it will be ignored.
      *            If used, the Binarizer will call BitArray.clear(). Always use the returned object.
      *
-     * @return The array of bits for this row (true means black).
+     * @return array The array of bits for this row (true means black).
      * @throws NotFoundException if row can't be binarized
      */
     public abstract function getBlackRow($y, $row);
@@ -65,7 +68,7 @@ public abstract function getBlackRow($y, $row);
      * may not apply sharpening. Therefore, a row from this matrix may not be identical to one
      * fetched using getBlackRow(), so don't mix and match between them.
      *
-     * @return The 2D array of bits for the image (true means black).
+     * @return BitMatrix The 2D array of bits for the image (true means black).
      * @throws NotFoundException if image can't be binarized to make a matrix
      */
     public abstract function getBlackMatrix();
@@ -77,7 +80,7 @@ public abstract function getBlackMatrix();
      *
      * @param source The LuminanceSource this Binarizer will operate on.
      *
-     * @return A new concrete Binarizer implementation object.
+     * @return Binarizer A new concrete Binarizer implementation object.
      */
     public abstract function createBinarizer($source);
 

lib/BinaryBitmap.php

@@ -29,28 +29,27 @@
  */
 final class BinaryBitmap
 {
-
     private $binarizer;
     private $matrix;
 
-    public function __construct($binarizer)
+    public function __construct(Binarizer $binarizer)
     {
-        if ($binarizer == null) {
+        if ($binarizer === null) {
             throw new \InvalidArgumentException("Binarizer must be non-null.");
         }
         $this->binarizer = $binarizer;
     }
 
     /**
-     * @return The width of the bitmap.
+     * @return int The width of the bitmap.
      */
     public function getWidth()
     {
         return $this->binarizer->getWidth();
     }
 
     /**
-     * @return The height of the bitmap.
+     * @return int The height of the bitmap.
      */
     public function getHeight()
     {
@@ -66,7 +65,7 @@ public function getHeight()
      * @param row An optional preallocated array. If null or too small, it will be ignored.
      *            If used, the Binarizer will call BitArray.clear(). Always use the returned object.
      *
-     * @return The array of bits for this row (true means black).
+     * @return array The array of bits for this row (true means black).
      * @throws NotFoundException if row can't be binarized
      */
     public function getBlackRow($y, $row)
@@ -91,7 +90,7 @@ public function isCropSupported()
      * @param width  The width of the rectangle to crop.
      * @param height The height of the rectangle to crop.
      *
-     * @return A cropped version of this object.
+     * @return BinaryBitmap A cropped version of this object.
      */
     public function crop($left, $top, $width, $height)
     {
@@ -112,7 +111,7 @@ public function isRotateSupported()
      * Returns a new object with rotated image data by 90 degrees counterclockwise.
      * Only callable if {@link #isRotateSupported()} is true.
      *
-     * @return A rotated version of this object.
+     * @return BinaryBitmap A rotated version of this object.
      */
     public function rotateCounterClockwise()
     {
@@ -125,7 +124,7 @@ public function rotateCounterClockwise()
      * Returns a new object with rotated image data by 45 degrees counterclockwise.
      * Only callable if {@link #isRotateSupported()} is true.
      *
-     * @return A rotated version of this object.
+     * @return BinaryBitmap A rotated version of this object.
      */
     public function rotateCounterClockwise45()
     {
@@ -139,8 +138,9 @@ public function toString()
         try {
             return $this->getBlackMatrix()->toString();
         } catch (NotFoundException $e) {
-            return "";
         }
+
+        return '';
     }
 
 //@Override
@@ -151,17 +151,17 @@ public function toString()
      * may not apply sharpening. Therefore, a row from this matrix may not be identical to one
      * fetched using getBlackRow(), so don't mix and match between them.
      *
-     * @return The 2D array of bits for the image (true means black).
+     * @return BitMatrix The 2D array of bits for the image (true means black).
      * @throws NotFoundException if image can't be binarized to make a matrix
      */
-    public function getBlackMatrix()
+    public function getBlackMatrix(): BitMatrix
     {
 // The matrix is created on demand the first time it is requested, then cached. There are two
 // reasons for this:
 // 1. This work will never be done if the caller only installs 1D Reader objects, or if a
 //    1D Reader finds a barcode before the 2D Readers run.
 // 2. This work will only be done once even if the caller installs multiple 2D Readers.
-        if ($this->matrix == null) {
+        if ($this->matrix === null) {
             $this->matrix = $this->binarizer->getBlackMatrix();
         }
 

lib/GDLuminanceSource.php

@@ -110,7 +110,7 @@ public function GDLuminanceSource($gdImage, $width, $height)
     public function getRow($y, $row = null)
     {
         if ($y < 0 || $y >= $this->getHeight()) {
-            throw new \InvalidArgumentException("Requested row is outside the image: " + y);
+            throw new \InvalidArgumentException('Requested row is outside the image: ' . $y);
         }
         $width = $this->getWidth();
         if ($row == null || count($row) < $width) {

lib/IMagickLuminanceSource.php

@@ -1,14 +1,10 @@
 <?php
 
-
 namespace Zxing;
 
 /**
  * This class is used to help decode images from files which arrive as GD Resource
  * It does not support rotation.
- *
- *
- *
  */
 final class IMagickLuminanceSource extends LuminanceSource
 {
@@ -44,7 +40,7 @@ public function __construct(
         $this->top        = $top;
     }
 
-    public function _IMagickLuminanceSource($image, $width, $height)
+    public function _IMagickLuminanceSource(\Imagick $image, $width, $height)
     {
         parent::__construct($width, $height);
 
@@ -66,8 +62,8 @@ public function _IMagickLuminanceSource($image, $width, $height)
         $array = [];
         $rgb   = [];
 
-        for ($i = 0; $i < count($pixels); $i += 3) {
-
+        $countPixels = count($pixels);
+        for ($i = 0; $i < $countPixels; $i += 3) {
             $r = $pixels[$i] & 0xff;
             $g = $pixels[$i + 1] & 0xff;
             $b = $pixels[$i + 2] & 0xff;
@@ -86,7 +82,7 @@ public function _IMagickLuminanceSource($image, $width, $height)
     public function getRow($y, $row = null)
     {
         if ($y < 0 || $y >= $this->getHeight()) {
-            throw new \InvalidArgumentException("Requested row is outside the image: " + y);
+            throw new \InvalidArgumentException('Requested row is outside the image: ' . $y);
         }
         $width = $this->getWidth();
         if ($row == null || count($row) < $width) {

lib/QrReader.php

@@ -2,6 +2,8 @@
 
 namespace Zxing;
 
+use Zxing\Common\HybridBinarizer;
+
 final class QrReader
 {
     const SOURCE_TYPE_FILE     = 'file';
@@ -12,11 +14,15 @@ final class QrReader
     public function __construct($imgsource, $sourcetype = QrReader::SOURCE_TYPE_FILE, $isUseImagickIfAvailable = true)
     {
         try {
+            $time = microtime(true);
             switch ($sourcetype) {
                 case QrReader::SOURCE_TYPE_FILE:
                     if ($isUseImagickIfAvailable && extension_loaded('imagick')) {
                         $im = new \Imagick();
                         $im->readImage($imgsource);
+                        $im->rotateImage('#00000000', 180);
+                        $im->cropImage(500, 500, 0, 0);
+//                        $im->writeImage('test.jpg');
                     } else {
                         $image = file_get_contents($imgsource);
                         $im    = imagecreatefromstring($image);
@@ -44,16 +50,18 @@ public function __construct($imgsource, $sourcetype = QrReader::SOURCE_TYPE_FILE
             if ($isUseImagickIfAvailable && extension_loaded('imagick')) {
                 $width  = $im->getImageWidth();
                 $height = $im->getImageHeight();
-                $source = new \Zxing\IMagickLuminanceSource($im, $width, $height);
+                $source = new IMagickLuminanceSource($im, $width, $height);
             } else {
                 $width  = imagesx($im);
                 $height = imagesy($im);
-                $source = new \Zxing\GDLuminanceSource($im, $width, $height);
+                $source = new GDLuminanceSource($im, $width, $height);
             }
-            $histo  = new \Zxing\Common\HybridBinarizer($source);
-            $bitmap = new \Zxing\BinaryBitmap($histo);
+            $histo  = new HybridBinarizer($source);
+            $bitmap = new BinaryBitmap($histo);
             $reader = new \Zxing\Qrcode\QRCodeReader();
 
+            echo 'init ', microtime(true) - $time, PHP_EOL;
+
             $this->result = $reader->decode($bitmap);
         } catch (\Zxing\NotFoundException $er) {
             $this->result = false;

lib/common/HybridBinarizer.php

@@ -88,7 +88,7 @@ public function getBlackMatrix()
             $blackPoints = $this->calculateBlackPoints($luminances, $subWidth, $subHeight, $width, $height);
 
             $newMatrix = new BitMatrix($width, $height);
-            $this->calculateThresholdForBlock($luminances, $subWidth, $subHeight, $width, $height, $blackPoints, $newMatrix);
+            self::calculateThresholdForBlock($luminances, $subWidth, $subHeight, $width, $height, $blackPoints, $newMatrix);
             $this->matrix = $newMatrix;
         } else {
 // If the image is too small, fall back to the global histogram approach.

lib/common/reedsolomon/ReedSolomonDecoder.php

@@ -81,7 +81,8 @@ public function decode(&$received, $twoS)
         $omega           = $sigmaOmega[1];
         $errorLocations  = $this->findErrorLocations($sigma);
         $errorMagnitudes = $this->findErrorMagnitudes($omega, $errorLocations);
-        for ($i = 0; $i < count($errorLocations); $i++) {
+        $errorLocationsCount = count($errorLocations);
+        for ($i = 0; $i < $errorLocationsCount; $i++) {
             $position = count($received) - 1 - $this->field->log($errorLocations[$i]);
             if ($position < 0) {
                 throw new ReedSolomonException("Bad error location");

lib/qrcode/QRCodeReader.php

@@ -60,11 +60,15 @@ public function decode(BinaryBitmap $image, $hints = null)
             $decoderResult = $this->decoder->decode($bits, $hints);
             $points        = self::$NO_POINTS;
         } else {
+            $time = microtime(true);
             $detector       = new Detector($image->getBlackMatrix());
             $detectorResult = $detector->detect($hints);
+            echo sprintf('detect: %f', microtime(true) - $time),PHP_EOL;
 
+            $time = microtime(true);
             $decoderResult = $this->decoder->decode($detectorResult->getBits(), $hints);
             $points        = $detectorResult->getPoints();
+            echo sprintf('decode: %f', microtime(true) - $time),PHP_EOL;
         }
 
         // If the code was mirrored: swap the bottom-left and the top-right points.

lib/qrcode/decoder/DataBlock.php

@@ -71,7 +71,8 @@ public static function getDataBlocks($rawCodewords,
         $result          = [];//new DataBlock[$totalBlocks];
         $numResultBlocks = 0;
         foreach ($ecBlockArray as $ecBlock) {
-            for ($i = 0; $i < $ecBlock->getCount(); $i++) {
+            $ecBlockCount = $ecBlock->getCount();
+            for ($i = 0; $i < $ecBlockCount; $i++) {
                 $numDataCodewords           = $ecBlock->getDataCodewords();
                 $numBlockCodewords          = $ecBlocks->getECCodewordsPerBlock() + $numDataCodewords;
                 $result[$numResultBlocks++] = new DataBlock($numDataCodewords, fill_array(0, $numBlockCodewords, 0));

lib/qrcode/decoder/Mode.php

@@ -45,7 +45,7 @@ public function __construct($characterCountBitsForVersions, $bits)
         $this->bits                          = $bits;
     }
 
-    static function Init()
+    public static function Init()
     {