diff options
| author | Siddharth Deshpande <dsiddharth2@gmail.com> | 2018-07-09 17:37:16 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 17:37:16 +0530 |
| commit | a5dded82150d4b38e4b2cded8efd99fdce839aa7 (patch) | |
| tree | 8d8e457f4eed0b3e4d89c42763cd5258a611ac46 | |
| parent | 991c4edad5056b7d0f6010b3e2228ecd761ad719 (diff) | |
| parent | 862fac576faff671145e8197d22bb15c354227d5 (diff) | |
| download | php-zxing-master.zip php-zxing-master.tar.gz php-zxing-master.tar.bz2 | |
Merge pull request #5 from matrad/masterHEADorigin/masterorigin/HEADmaster
(upgrade) upgraded zxing library to 3.3.3
| -rw-r--r-- | src/PHPZxing/PHPZxingBase.php | 11 | ||||
| -rw-r--r-- | src/PHPZxing/PHPZxingDecoder.php | 2 | ||||
| -rwxr-xr-x | src/bin/core-3.2.0.jar | bin | 544173 -> 0 bytes | |||
| -rw-r--r-- | src/bin/core-3.3.3.jar | bin | 0 -> 543115 bytes | |||
| -rwxr-xr-x | src/bin/javase-3.2.0.jar | bin | 39203 -> 0 bytes | |||
| -rw-r--r-- | src/bin/javase-3.3.3.jar | bin | 0 -> 41671 bytes | |||
| -rw-r--r-- | src/bin/jcommander-1.72.jar | bin | 0 -> 69254 bytes |
7 files changed, 10 insertions, 3 deletions
diff --git a/src/PHPZxing/PHPZxingBase.php b/src/PHPZxing/PHPZxingBase.php index fbad3fe..67e1fe4 100644 --- a/src/PHPZxing/PHPZxingBase.php +++ b/src/PHPZxing/PHPZxingBase.php @@ -37,10 +37,13 @@ namespace PHPZxing; class PHPZxingBase { // name of the javase.jar file located in /src/bin directory - private $_JAVASE_PATH = 'javase-3.2.0.jar'; + private $_JAVASE_PATH = 'javase-3.3.3.jar'; // name of the core.jar file located in /src/bin directory - private $_CORE_PATH = "core-3.2.0.jar"; + private $_CORE_PATH = "core-3.3.3.jar"; + + // name of the jcommander.jar file located in /src/bin directory + private $_JCOMMANDER_PATH = "jcommander-1.72.jar"; // location of java in your machine private $_JAVA_PATH = "/usr/bin/java"; @@ -57,6 +60,10 @@ class PHPZxingBase { return dirname(__DIR__) . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . $this->_CORE_PATH; } + public function getJcommanderPath() { + return dirname(__DIR__) . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . $this->_JCOMMANDER_PATH; + } + /** * Set the default java path which we will use for decoding */ diff --git a/src/PHPZxing/PHPZxingDecoder.php b/src/PHPZxing/PHPZxingDecoder.php index 42176da..10a9056 100644 --- a/src/PHPZxing/PHPZxingDecoder.php +++ b/src/PHPZxing/PHPZxingDecoder.php @@ -89,7 +89,7 @@ class PHPZxingDecoder extends PHPZxingBase { private function basePrepare() { $command = ""; $command = $command . $this->getJavaPath() . $this->SPACE . "-cp" . $this->SPACE; - $command = $command . $this->getJARPath() . PATH_SEPARATOR . $this->getCorePAth() . $this->SPACE; + $command = $command . $this->getJARPath() . PATH_SEPARATOR . $this->getCorePAth() . PATH_SEPARATOR . $this->getJcommanderPath() . $this->SPACE; $command = $command . $this->JAVA_DECODER_CLASS . $this->SPACE; return $command; } diff --git a/src/bin/core-3.2.0.jar b/src/bin/core-3.2.0.jar Binary files differdeleted file mode 100755 index 6af9c62..0000000 --- a/src/bin/core-3.2.0.jar +++ /dev/null diff --git a/src/bin/core-3.3.3.jar b/src/bin/core-3.3.3.jar Binary files differnew file mode 100644 index 0000000..21eee68 --- /dev/null +++ b/src/bin/core-3.3.3.jar diff --git a/src/bin/javase-3.2.0.jar b/src/bin/javase-3.2.0.jar Binary files differdeleted file mode 100755 index c8a424e..0000000 --- a/src/bin/javase-3.2.0.jar +++ /dev/null diff --git a/src/bin/javase-3.3.3.jar b/src/bin/javase-3.3.3.jar Binary files differnew file mode 100644 index 0000000..3f3cdbc --- /dev/null +++ b/src/bin/javase-3.3.3.jar diff --git a/src/bin/jcommander-1.72.jar b/src/bin/jcommander-1.72.jar Binary files differnew file mode 100644 index 0000000..acb8e60 --- /dev/null +++ b/src/bin/jcommander-1.72.jar |