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 21:26:08 +02:00
commit cf6943cbe9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,9 +419,9 @@ class StructTools
if (!is_int($result[$arraycount]) && !is_float($result[$arraycount])) { if (!is_int($result[$arraycount]) && !is_float($result[$arraycount])) {
$result[$arraycount] = (int) $result[$arraycount]; $result[$arraycount] = (int) $result[$arraycount];
} }
if (is_float($result[$arraycount]) && $result[$arraycount] < PHP_INT_MAX) { /* if (is_float($result[$arraycount]) && $result[$arraycount] < PHP_INT_MAX) {
$result[$arraycount] = (int) $result[$arraycount]; $result[$arraycount] = (int) $result[$arraycount];
} }*/
break; break;
case 'float': case 'float':
if (!is_float($result[$arraycount])) { if (!is_float($result[$arraycount])) {
@ -686,7 +686,7 @@ class StructTools
$negative = false; $negative = false;
} }
do { do {
$concat = ($number % 2).$concat; $concat = $this->posmod($number, 2).$concat;
$number = intval($number / 2); $number = intval($number / 2);
} while ($number > 0); } while ($number > 0);
$concat = str_pad($concat, $length, '0', STR_PAD_LEFT); $concat = str_pad($concat, $length, '0', STR_PAD_LEFT);
@ -697,7 +697,7 @@ class StructTools
$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 '.$concat.' is too long ('.strlen($concat).' > '.$length.').');
} }
return $concat; return $concat;