danog/PHPStruct
1
0
Fork 0
mirror of https://github.com/danog/PHPStruct.git synced 2024-12-02 09:17:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/danog/rightpack

Browse Source
This commit is contained in:
danogentili 2016-07-29 16:56:17 +02:00
commit 7da0d5c924
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/danog/PHP/StructTools.php
View File

@ -693,8 +693,8 @@ class StructTools
if ($negative) { if ($negative) {
$concat = $this->binadd($this->stringnot($concat), '1'); $concat = $this->binadd($this->stringnot($concat), '1');
} }
if(strlen($concat) == $length + 1 && $concat == str_pad("1", $length + 1, '0', STR_PAD_RIGHT)){ if (strlen($concat) == $length + 1 && $concat == str_pad('1', $length + 1, '0', STR_PAD_RIGHT)) {
$concat = str_pad("", $length, "0"); $concat = str_pad('', $length, '0');
} }
if (strlen($concat) > $length) { if (strlen($concat) > $length) {
trigger_error('Converted binary number is too long ('.strlen($concat).' > '.$length.').'); trigger_error('Converted binary number is too long ('.strlen($concat).' > '.$length.').');
@ -716,7 +716,7 @@ class StructTools
public function bindec($binary, $unsigned = true) public function bindec($binary, $unsigned = true)
{ {
$decimal = 0; $decimal = 0;
if (!$unsigned && $binary[0] == "1") { if (!$unsigned && $binary[0] == '1') {
$binary = $this->binadd($this->stringnot($binary), '1'); $binary = $this->binadd($this->stringnot($binary), '1');
$negative = true; $negative = true;
} else { } else {