Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #11 from Gemorroj/master

Fixes in EAN 8 and EAN 13
  • Loading branch information...
commit 0e274b4dbc1ce1a0887c14f5367267f456ea4fca 2 parents ecd15ec + f3f2b62
@CloCkWeRX CloCkWeRX authored
View
4 Image/Barcode2/Common.php
@@ -13,7 +13,7 @@ class Image_Barcode2_Common
protected $_writer;
/**
- * @var Barcode
+ * @var string barcode
*/
protected $_barcode;
@@ -44,7 +44,7 @@ public function getWriter()
}
/**
- * @param string barcode
+ * @param string $barcode
*/
public function setBarcode($barcode)
{
View
2  Image/Barcode2/Driver.php
@@ -18,7 +18,7 @@ public function setWriter(Image_Barcode2_Writer $writer);
/**
* Set barcode
*
- * @param string barcode
+ * @param string $barcode
*/
public function setBarcode($barcode);
View
24 Image/Barcode2/Writer.php
@@ -8,35 +8,43 @@
*/
class Image_Barcode2_Writer
{
- public function imagecreate($width, $height) {
+ public function imagecreate($width, $height)
+ {
return imagecreate($width, $height);
}
- public function imagestring($image, $font, $x, $y, $string, $color) {
+ public function imagestring($image, $font, $x, $y, $string, $color)
+ {
return imagestring($image, $font, $x, $y, $string, $color);
}
- public function imagefill($image, $x, $y, $color) {
+ public function imagefill($image, $x, $y, $color)
+ {
return imagefill($image, $x, $y, $color);
}
- public function imagefilledrectangle($image, $x1, $y1, $x2, $y2, $color) {
+ public function imagefilledrectangle($image, $x1, $y1, $x2, $y2, $color)
+ {
return imagefilledrectangle($image, $x1, $y1, $x2, $y2, $color);
}
- public function imagefontheight($font) {
+ public function imagefontheight($font)
+ {
return imagefontheight($font);
}
- public function imagefontwidth($font) {
+ public function imagefontwidth($font)
+ {
return imagefontwidth($font);
}
- public function imagecolorallocate($image, $red, $green, $blue) {
+ public function imagecolorallocate($image, $red, $green, $blue)
+ {
return imagecolorallocate($image, $red, $green, $blue);
}
- public function imageline($image, $x1, $y1, $x2, $y2, $color) {
+ public function imageline($image, $x1, $y1, $x2, $y2, $color)
+ {
return imageline($image, $x1, $y1, $x2, $y2, $color);
}
}
View
8 Image/Barcode2/ean13.php
@@ -241,7 +241,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $this->getBarcodeHeight(),
$black
);
}
@@ -258,7 +258,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $barcodelongheight,
$black
);
$xpos += $this->getBarcodeWidth();
@@ -270,7 +270,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $barcodelongheight,
$black
);
$xpos += $this->getBarcodeWidth();
@@ -298,7 +298,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $this->getBarcodeHeight(),
$black
);
}
View
4 Image/Barcode2/ean8.php
@@ -199,7 +199,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $this->getBarcodeHeight(),
$black
);
}
@@ -258,7 +258,7 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight,
+ $this->getBarcodeHeight(),
$black
);
}
View
3  Image/Barcode2/upca.php
@@ -215,7 +215,8 @@ public function draw()
$xpos,
0,
$xpos + $this->getBarcodeWidth() - 1,
- $barcodelongheight, $black
+ $barcodelongheight,
+ $black
);
}
$xpos += $this->getBarcodeWidth();
Please sign in to comment.
Something went wrong with that request. Please try again.