Bug fixes

This commit is contained in:
Dennis Eichhorn 2016-02-21 21:40:00 +01:00
parent e90c2a3e71
commit 8ae57da02a
3 changed files with 11 additions and 11 deletions

View File

@ -22,7 +22,7 @@ abstract class C128Abstract
protected $background = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; protected $background = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0];
protected $front = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; protected $front = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0];
public function __construct(string $content = '', int $size = 20, int $orientation = 0) public function __construct(string $content = '', int $size = 20, int $orientation = OrientationType::HORIZONTAL)
{ {
$this->content = $content; $this->content = $content;
$this->setSize($size); $this->setSize($size);
@ -54,27 +54,27 @@ abstract class C128Abstract
protected function generateCodeString() protected function generateCodeString()
{ {
$keys = array_keys(self::$CODEARRAY); $keys = array_keys(static::$CODEARRAY);
$values = array_flip($keys); $values = array_flip($keys);
$codeString = ''; $codeString = '';
$length = strlen($this->content); $length = strlen($this->content);
$checksum = self::$CHECKSUM; $checksum = static::$CHECKSUM;
for ($pos = 1; $pos <= $length; $pos += 2) { for ($pos = 1; $pos <= $length; $pos++) {
$activeKey = substr($this->content, ($pos - 1), 1); $activeKey = substr($this->content, ($pos - 1), 1);
$codeString .= self::$CODEARRAY[$activeKey]; $codeString .= static::$CODEARRAY[$activeKey];
$checksum = ($checksum + ($values[$activeKey] * $pos)); $checksum += $values[$activeKey] * $pos;
} }
$codeString .= self::$CODEARRAY[$keys[($checksum - (intval($checksum / 103) * 103))]]; $codeString .= static::$CODEARRAY[$keys[($checksum - (intval($checksum / 103) * 103))]];
$codeString = self::$CODE_START . $codeString . self::$CODE_END; $codeString = static::$CODE_START . $codeString . static::$CODE_END;
return $codeString; return $codeString;
} }
public function get() public function get()
{ {
$codeString = self::$CODE_START . $this->generateCodeString() . self::$CODE_END; $codeString = static::$CODE_START . $this->generateCodeString() . static::$CODE_END;
return $this->createImage($codeString, 20); return $this->createImage($codeString, 20);
} }

View File

@ -32,7 +32,7 @@ class C128a extends C128Abstract
protected static $CODE_START = '211412'; protected static $CODE_START = '211412';
protected static $CODE_END = '2331112'; protected static $CODE_END = '2331112';
public function __construct(string $content = '', int $size = 20, int $orientation = 0) public function __construct(string $content = '', int $size = 20, int $orientation = OrientationType::HORIZONTAL)
{ {
parent::__construct(strtoupper($content), $size, $orientation); parent::__construct(strtoupper($content), $size, $orientation);
} }

View File

@ -49,7 +49,7 @@ class C128c extends C128Abstract
} }
$codeString .= self::$CODEARRAY[$activeKey]; $codeString .= self::$CODEARRAY[$activeKey];
$checksum = ($checksum + ($values[$activeKey] * $checkPos)); $checksum += $values[$activeKey] * $checkPos;
$checkPos++; $checkPos++;
} }