Skip to content

Commit 67f58a0

Browse files
committed
Merge pull request #4 from appfeel/master
Implement 'new QrReader()' from from blob image
2 parents 5868d61 + 5f8ba8d commit 67f58a0

File tree

1 file changed

+39
-10
lines changed

1 file changed

+39
-10
lines changed

lib/QrReader.php

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,55 @@
4848

4949
final class QrReader
5050
{
51+
const SOURCE_TYPE_FILE = 'file';
52+
const SOURCE_TYPE_BLOB = 'blob';
53+
const SOURCE_TYPE_RESOURCE = 'resource';
5154
public $result;
5255

53-
function __construct($filename)
56+
function __construct($imgsource, $sourcetype = QrReader::SOURCE_TYPE_FILE, $isUseImagickIfAvailable = true)
5457
{
5558

5659
try {
60+
switch($sourcetype) {
61+
case QrReader::SOURCE_TYPE_FILE:
62+
if($isUseImagickIfAvailable && extension_loaded('imagick')) {
63+
$im = new Imagick();
64+
$im->readImage($imgsource);
65+
}else {
66+
$image = file_get_contents($imgsource);
67+
$im = imagecreatefromstring($image);
68+
}
5769

58-
if(extension_loaded('imagick')) {
59-
$im = new Imagick();
60-
$im->readImage($filename);
70+
break;
71+
72+
case QrReader::SOURCE_TYPE_BLOB:
73+
if($isUseImagickIfAvailable && extension_loaded('imagick')) {
74+
$im = new Imagick();
75+
$im->readimageblob($imgsource);
76+
}else {
77+
$im = imagecreatefromstring($imgsource);
78+
}
79+
80+
break;
81+
82+
case QrReader::SOURCE_TYPE_RESOURCE:
83+
$im = $imgsource;
84+
if($isUseImagickIfAvailable && extension_loaded('imagick')) {
85+
$isUseImagickIfAvailable = true;
86+
}else {
87+
$isUseImagickIfAvailable = false;
88+
}
89+
90+
break;
91+
}
92+
93+
if($isUseImagickIfAvailable && extension_loaded('imagick')) {
6194
$width = $im->getImageWidth();
6295
$height = $im->getImageHeight();
6396
$source = new \Zxing\IMagickLuminanceSource($im, $width, $height);
6497
}else {
65-
$image = file_get_contents($filename);
66-
$sizes = getimagesize($filename);
67-
$width = $sizes[0];
68-
$height = $sizes[1];
69-
$im = imagecreatefromstring($image);
70-
98+
$width = imagesx($im);
99+
$height = imagesy($im);
71100
$source = new \Zxing\GDLuminanceSource($im, $width, $height);
72101
}
73102
$histo = new \Zxing\Common\HybridBinarizer($source);

0 commit comments

Comments
 (0)