[GENERIC] Zend_Barcode: add extra space between graphic and human readable text

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19939 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Barcode/Object/ObjectAbstract.php

@@ -753,19 +753,19 @@ abstract class Zend_Barcode_Object_ObjectAbstract
      * @param float $orientation
      */
     protected function _addText(
-        $text, 
-        $size, 
-        $position, 
-        $font, 
-        $color, 
-        $alignment = 'center', 
+        $text,
+        $size,
+        $position,
+        $font,
+        $color,
+        $alignment = 'center',
         $orientation = 0
     ) {
         if ($color === null) {
             $color = $this->_foreColor;
         }
         $this->_addInstruction(array(
-            'type'        => 'text', 
+            'type'        => 'text',
             'text'        => $text,
             'size'        => $size,
             'position'    => $position,
@@ -850,8 +850,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
      */
     protected function _calculateWidth()
     {
-        return (int) $this->_withBorder 
-            + $this->_calculateBarcodeWidth() 
+        return (int) $this->_withBorder
+            + $this->_calculateBarcodeWidth()
             + (int) $this->_withBorder;
     }
 
@@ -867,8 +867,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
      */
     protected function _calculateHeight()
     {
-        return (int) $this->_withBorder * 2 
-            + $this->_calculateBarcodeHeight() 
+        return (int) $this->_withBorder * 2
+            + $this->_calculateBarcodeHeight()
             + (int) $this->_withBorder * 2;
     }
 
@@ -882,7 +882,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract
         $extraHeight = 0;
         if ($this->_drawText) {
             $textHeight += $this->_fontSize;
-            $extraHeight = 1;
+            $extraHeight = 2;
         }
         return ($this->_barHeight + $textHeight) * $this->_factor + $extraHeight;
     }
@@ -894,8 +894,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
     public function getHeight($recalculate = false)
     {
         if ($this->_height === null || $recalculate) {
-            $this->_height = 
-                abs($this->_calculateHeight() * cos($this->_orientation / 180 * pi())) 
+            $this->_height =
+                abs($this->_calculateHeight() * cos($this->_orientation / 180 * pi()))
                 + abs($this->_calculateWidth() * sin($this->_orientation / 180 * pi()));
         }
         return $this->_height;
@@ -908,8 +908,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
     public function getWidth($recalculate = false)
     {
         if ($this->_width === null || $recalculate) {
-            $this->_width = 
-                abs($this->_calculateWidth() * cos($this->_orientation / 180 * pi())) 
+            $this->_width =
+                abs($this->_calculateWidth() * cos($this->_orientation / 180 * pi()))
                 + abs($this->_calculateHeight() * sin($this->_orientation / 180 * pi()));
         }
         return $this->_width;
@@ -977,11 +977,11 @@ abstract class Zend_Barcode_Object_ObjectAbstract
      */
     protected function _rotate($x1, $y1)
     {
-        $x2 = $x1 * cos($this->_orientation / 180 * pi()) 
-            - $y1 * sin($this->_orientation / 180 * pi()) 
+        $x2 = $x1 * cos($this->_orientation / 180 * pi())
+            - $y1 * sin($this->_orientation / 180 * pi())
             + $this->getOffsetLeft();
-        $y2 = $y1 * cos($this->_orientation / 180 * pi()) 
-            + $x1 * sin($this->_orientation / 180 * pi()) 
+        $y2 = $y1 * cos($this->_orientation / 180 * pi())
+            + $x1 * sin($this->_orientation / 180 * pi())
             + $this->getOffsetTop();
         return array(intval($x2) , intval($y2));
     }
@@ -1021,9 +1021,9 @@ abstract class Zend_Barcode_Object_ObjectAbstract
         $point4 = $this->_rotate($this->_calculateWidth() - 1, 0);
 
         $this->_addPolygon(array(
-            $point1, 
-            $point2, 
-            $point3, 
+            $point1,
+            $point2,
+            $point3,
             $point4
         ), $this->_backgroundColor);
 
@@ -1036,7 +1036,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract
                 $point1 = $this->_rotate($xpos, $ypos + $bar[2] * $barLength);
                 $point2 = $this->_rotate($xpos, $ypos + $bar[3] * $barLength);
                 $point3 = $this->_rotate(
-                    $xpos + $width - 1, 
+                    $xpos + $width - 1,
                     $ypos + $bar[3] * $barLength
                 );
                 $point4 = $this->_rotate(
@@ -1098,8 +1098,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
                         $this->_fontSize * $this->_factor,
                         $this->_rotate(
                             $leftPosition,
-                            (int) $this->_withBorder * 2 
-                                + $this->_factor * ($this->_barHeight + $this->_fontSize)
+                            (int) $this->_withBorder * 2
+                                + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
                         ),
                         $this->_font,
                         $this->_foreColor,
@@ -1113,8 +1113,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract
                     $this->_fontSize * $this->_factor,
                     $this->_rotate(
                         $this->_calculateWidth() / 2,
-                        (int) $this->_withBorder * 2 
-                            + $this->_factor * ($this->_barHeight + $this->_fontSize)
+                        (int) $this->_withBorder * 2
+                            + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
                     ),
                     $this->_font,
                     $this->_foreColor,
@@ -1135,7 +1135,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract
     /**
      * Each child must prepare the barcode and return
      * a table like array(
-     *     0 => array( 
+     *     0 => array(
      *         0 => int (visible(black) or not(white))
      *         1 => int (width of the bar)
      *         2 => float (0->1 position from the top of the beginning of the bar in %)

library/Zend/Barcode/Renderer/Image.php

@@ -38,8 +38,8 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
      * @var array
      */
     protected $_allowedImageType = array(
-        'png', 
-        'jpeg', 
+        'png',
+        'jpeg',
         'gif',
     );
 
@@ -99,7 +99,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Get barcode height
-     * 
+     *
      * @return int
      */
     public function getHeight()
@@ -109,8 +109,8 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Set barcode width
-     * 
-     * @param mixed $value 
+     *
+     * @param mixed $value
      * @return void
      */
     public function setWidth($value)
@@ -127,7 +127,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Get barcode width
-     * 
+     *
      * @return int
      */
     public function getWidth()
@@ -181,7 +181,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Retrieve the image type to produce
-     * 
+     *
      * @return string
      */
     public function getImageType()
@@ -254,8 +254,8 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
         }
         $this->_adjustPosition(imagesy($this->_resource), imagesx($this->_resource));
         imagefilledrectangle(
-            $this->_resource, 
-            $this->_leftOffset, 
+            $this->_resource,
+            $this->_leftOffset,
             $this->_topOffset,
             $this->_leftOffset + $barcodeWidth - 1,
             $this->_topOffset + $barcodeHeight - 1,
@@ -265,7 +265,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Check barcode parameters
-     * 
+     *
      * @return void
      */
     protected function _checkParams()
@@ -275,7 +275,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
 
     /**
      * Check barcode dimensions
-     * 
+     *
      * @return void
      */
     protected function _checkDimensions()
@@ -357,7 +357,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
         );
 
         $allocatedColor = imagecolorallocate(
-            $this->_resource, 
+            $this->_resource,
             ($color & 0xFF0000) >> 16,
             ($color & 0x00FF00) >> 8,
             $color & 0x0000FF
@@ -384,7 +384,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
     protected function _drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
     {
         $allocatedColor = imagecolorallocate(
-            $this->_resource, 
+            $this->_resource,
             ($color & 0xFF0000) >> 16,
             ($color & 0x00FF00) >> 8,
             $color & 0x0000FF
@@ -411,7 +411,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
                 );
             }
             $fontWidth = imagefontwidth($font);
-            $positionY = $position[1] - imagefontheight($font);
+            $positionY = $position[1] - imagefontheight($font) + 1;
             switch ($alignment) {
                 case 'left':
                     $positionX = $position[0];
@@ -438,13 +438,13 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
                     break;
             }
             imagettftext(
-                $this->_resource, 
-                $size, 
+                $this->_resource,
+                $size,
                 $orientation,
                 $position[0] - ($width * cos(pi() * $orientation / 180)),
                 $position[1] + ($width * sin(pi() * $orientation / 180)),
                 $allocatedColor,
-                $font, 
+                $font,
                 $text
             );
         }

tests/Zend/Barcode/Object/Itf14Test.php

@@ -223,6 +223,6 @@ class Zend_Barcode_Object_Itf14Test extends Zend_Barcode_Object_TestCommon
     {
         // Checksum activated => text needed
         $this->_object->setText('0000123456789');
-        $this->assertEquals(61, $this->_object->getHeight(true));
+        $this->assertEquals(62, $this->_object->getHeight(true));
     }
 }

tests/Zend/Barcode/Object/TestCommon.php

@@ -479,6 +479,6 @@ abstract class Zend_Barcode_Object_TestCommon extends PHPUnit_Framework_TestCase
 
     public function testGetDefaultHeight()
     {
-        $this->assertEquals(61, $this->_object->getHeight());
+        $this->assertEquals(62, $this->_object->getHeight());
     }
 }

tests/Zend/Barcode/Object/_files/Code25_0123456789_border_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       2 => 
       array (
         0 => 181,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
@@ -1672,12 +1672,12 @@ array (
       2 => 
       array (
         0 => 181,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       4 => 
       array (
@@ -1696,7 +1696,7 @@ array (
     'position' => 
     array (
       0 => 91,
-      1 => 62,
+      1 => 63,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Code25_0123456789_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 179,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1662,7 +1662,7 @@ array (
     'position' => 
     array (
       0 => 90,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Code25_0123456789_stretchtext_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 179,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1662,7 +1662,7 @@ array (
     'position' => 
     array (
       0 => 18,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1677,7 +1677,7 @@ array (
     'position' => 
     array (
       0 => 34,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1692,7 +1692,7 @@ array (
     'position' => 
     array (
       0 => 50,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1707,7 +1707,7 @@ array (
     'position' => 
     array (
       0 => 66,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1722,7 +1722,7 @@ array (
     'position' => 
     array (
       0 => 82,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1737,7 +1737,7 @@ array (
     'position' => 
     array (
       0 => 98,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1752,7 +1752,7 @@ array (
     'position' => 
     array (
       0 => 114,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1767,7 +1767,7 @@ array (
     'position' => 
     array (
       0 => 130,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1782,7 +1782,7 @@ array (
     'position' => 
     array (
       0 => 146,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1797,7 +1797,7 @@ array (
     'position' => 
     array (
       0 => 162,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Code39_0123456789_border_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       2 => 
       array (
         0 => 212,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
@@ -1788,12 +1788,12 @@ array (
       2 => 
       array (
         0 => 212,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       4 => 
       array (
@@ -1812,7 +1812,7 @@ array (
     'position' => 
     array (
       0 => 106,
-      1 => 62,
+      1 => 63,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Code39_0123456789_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 210,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1778,7 +1778,7 @@ array (
     'position' => 
     array (
       0 => 105,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Code39_0123456789_stretchtext_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 210,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1778,7 +1778,7 @@ array (
     'position' => 
     array (
       0 => 17,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1793,7 +1793,7 @@ array (
     'position' => 
     array (
       0 => 33,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1808,7 +1808,7 @@ array (
     'position' => 
     array (
       0 => 49,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1823,7 +1823,7 @@ array (
     'position' => 
     array (
       0 => 65,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1838,7 +1838,7 @@ array (
     'position' => 
     array (
       0 => 81,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1853,7 +1853,7 @@ array (
     'position' => 
     array (
       0 => 97,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1868,7 +1868,7 @@ array (
     'position' => 
     array (
       0 => 113,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1883,7 +1883,7 @@ array (
     'position' => 
     array (
       0 => 129,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1898,7 +1898,7 @@ array (
     'position' => 
     array (
       0 => 145,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1913,7 +1913,7 @@ array (
     'position' => 
     array (
       0 => 161,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1928,7 +1928,7 @@ array (
     'position' => 
     array (
       0 => 177,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1943,7 +1943,7 @@ array (
     'position' => 
     array (
       0 => 193,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_bearerbar_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 118,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -937,7 +937,7 @@ array (
     'position' => 
     array (
       0 => 59,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_bearerbar_oriented_instructions.php

@@ -8,7 +8,7 @@ array (
     array (
       0 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
       1 => 
@@ -23,7 +23,7 @@ array (
       ),
       3 => 
       array (
-        0 => 111,
+        0 => 112,
         1 => 102,
       ),
     ),
@@ -37,22 +37,22 @@ array (
     array (
       0 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
       1 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       2 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       3 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
     ),
@@ -66,22 +66,22 @@ array (
     array (
       0 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
       1 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       2 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       3 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
     ),
@@ -95,22 +95,22 @@ array (
     array (
       0 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
       1 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       2 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       3 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
     ),
@@ -124,22 +124,22 @@ array (
     array (
       0 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
       1 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       2 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       3 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
     ),
@@ -153,22 +153,22 @@ array (
     array (
       0 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 17,
       ),
       1 => 
       array (
-        0 => 19,
+        0 => 20,
         1 => 42,
       ),
       2 => 
       array (
-        0 => 20,
+        0 => 21,
         1 => 44,
       ),
       3 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 19,
       ),
     ),
@@ -182,22 +182,22 @@ array (
     array (
       0 => 
       array (
-        0 => 64,
+        0 => 65,
         1 => 20,
       ),
       1 => 
       array (
-        0 => 21,
+        0 => 22,
         1 => 45,
       ),
       2 => 
       array (
-        0 => 22,
+        0 => 23,
         1 => 47,
       ),
       3 => 
       array (
-        0 => 65,
+        0 => 66,
         1 => 22,
       ),
     ),
@@ -211,22 +211,22 @@ array (
     array (
       0 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
       1 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       2 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       3 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
     ),
@@ -240,22 +240,22 @@ array (
     array (
       0 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
       1 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       2 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       3 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
     ),
@@ -269,22 +269,22 @@ array (
     array (
       0 => 
       array (
-        0 => 70,
+        0 => 71,
         1 => 31,
       ),
       1 => 
       array (
-        0 => 27,
+        0 => 28,
         1 => 56,
       ),
       2 => 
       array (
-        0 => 28,
+        0 => 29,
         1 => 57,
       ),
       3 => 
       array (
-        0 => 71,
+        0 => 72,
         1 => 32,
       ),
     ),
@@ -298,22 +298,22 @@ array (
     array (
       0 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
       1 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       2 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       3 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
     ),
@@ -327,22 +327,22 @@ array (
     array (
       0 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
       1 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       2 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       3 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
     ),
@@ -356,22 +356,22 @@ array (
     array (
       0 => 
       array (
-        0 => 75,
+        0 => 76,
         1 => 39,
       ),
       1 => 
       array (
-        0 => 32,
+        0 => 33,
         1 => 64,
       ),
       2 => 
       array (
-        0 => 33,
+        0 => 34,
         1 => 66,
       ),
       3 => 
       array (
-        0 => 76,
+        0 => 77,
         1 => 41,
       ),
     ),
@@ -385,22 +385,22 @@ array (
     array (
       0 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
       1 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       2 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       3 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
     ),
@@ -414,22 +414,22 @@ array (
     array (
       0 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
       1 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       2 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       3 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
     ),
@@ -443,22 +443,22 @@ array (
     array (
       0 => 
       array (
-        0 => 80,
+        0 => 81,
         1 => 48,
       ),
       1 => 
       array (
-        0 => 37,
+        0 => 38,
         1 => 73,
       ),
       2 => 
       array (
-        0 => 38,
+        0 => 39,
         1 => 75,
       ),
       3 => 
       array (
-        0 => 81,
+        0 => 82,
         1 => 50,
       ),
     ),
@@ -472,22 +472,22 @@ array (
     array (
       0 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
       1 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       2 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       3 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
     ),
@@ -501,22 +501,22 @@ array (
     array (
       0 => 
       array (
-        0 => 84,
+        0 => 85,
         1 => 55,
       ),
       1 => 
       array (
-        0 => 41,
+        0 => 42,
         1 => 80,
       ),
       2 => 
       array (
-        0 => 42,
+        0 => 43,
         1 => 82,
       ),
       3 => 
       array (
-        0 => 85,
+        0 => 86,
         1 => 57,
       ),
     ),
@@ -530,22 +530,22 @@ array (
     array (
       0 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
       1 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       2 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       3 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
     ),
@@ -559,22 +559,22 @@ array (
     array (
       0 => 
       array (
-        0 => 87,
+        0 => 88,
         1 => 60,
       ),
       1 => 
       array (
-        0 => 44,
+        0 => 45,
         1 => 85,
       ),
       2 => 
       array (
-        0 => 45,
+        0 => 46,
         1 => 87,
       ),
       3 => 
       array (
-        0 => 88,
+        0 => 89,
         1 => 62,
       ),
     ),
@@ -588,22 +588,22 @@ array (
     array (
       0 => 
       array (
-        0 => 89,
+        0 => 90,
         1 => 64,
       ),
       1 => 
       array (
-        0 => 46,
+        0 => 47,
         1 => 89,
       ),
       2 => 
       array (
-        0 => 47,
+        0 => 48,
         1 => 90,
       ),
       3 => 
       array (
-        0 => 90,
+        0 => 91,
         1 => 65,
       ),
     ),
@@ -617,22 +617,22 @@ array (
     array (
       0 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
       1 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       2 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       3 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
     ),
@@ -646,22 +646,22 @@ array (
     array (
       0 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
       1 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       2 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       3 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
     ),
@@ -675,22 +675,22 @@ array (
     array (
       0 => 
       array (
-        0 => 95,
+        0 => 96,
         1 => 74,
       ),
       1 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 99,
       ),
       2 => 
       array (
-        0 => 53,
+        0 => 54,
         1 => 101,
       ),
       3 => 
       array (
-        0 => 96,
+        0 => 97,
         1 => 76,
       ),
     ),
@@ -704,22 +704,22 @@ array (
     array (
       0 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
       1 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       2 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       3 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
     ),
@@ -733,22 +733,22 @@ array (
     array (
       0 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
       1 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       2 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       3 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
     ),
@@ -762,22 +762,22 @@ array (
     array (
       0 => 
       array (
-        0 => 100,
+        0 => 101,
         1 => 83,
       ),
       1 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 108,
       ),
       2 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 109,
       ),
       3 => 
       array (
-        0 => 101,
+        0 => 102,
         1 => 84,
       ),
     ),
@@ -791,22 +791,22 @@ array (
     array (
       0 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
       1 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       2 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       3 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
     ),
@@ -820,22 +820,22 @@ array (
     array (
       0 => 
       array (
-        0 => 104,
+        0 => 105,
         1 => 90,
       ),
       1 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 115,
       ),
       2 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 116,
       ),
       3 => 
       array (
-        0 => 105,
+        0 => 106,
         1 => 91,
       ),
     ),
@@ -849,22 +849,22 @@ array (
     array (
       0 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
       1 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       2 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       3 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
     ),
@@ -878,12 +878,12 @@ array (
     array (
       0 => 
       array (
-        0 => 53,
+        0 => 54,
         1 => -1,
       ),
       1 => 
       array (
-        0 => 112,
+        0 => 113,
         1 => 101,
       ),
       2 => 
@@ -893,7 +893,7 @@ array (
       ),
       3 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 0,
       ),
     ),
@@ -907,12 +907,12 @@ array (
     array (
       0 => 
       array (
-        0 => 10,
+        0 => 11,
         1 => 24,
       ),
       1 => 
       array (
-        0 => 69,
+        0 => 70,
         1 => 126,
       ),
       2 => 
@@ -937,7 +937,7 @@ array (
     'position' => 
     array (
       0 => 30,
-      1 => 81,
+      1 => 82,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_border_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       2 => 
       array (
         0 => 120,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
@@ -889,12 +889,12 @@ array (
       2 => 
       array (
         0 => 120,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       4 => 
       array (
@@ -913,7 +913,7 @@ array (
     'position' => 
     array (
       0 => 60,
-      1 => 62,
+      1 => 63,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_border_oriented_instructions.php

@@ -8,7 +8,7 @@ array (
     array (
       0 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
       1 => 
@@ -19,11 +19,11 @@ array (
       2 => 
       array (
         0 => 57,
-        1 => 135,
+        1 => 136,
       ),
       3 => 
       array (
-        0 => 112,
+        0 => 113,
         1 => 103,
       ),
     ),
@@ -37,22 +37,22 @@ array (
     array (
       0 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 10,
       ),
       1 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 35,
       ),
       2 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 35,
       ),
       3 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 10,
       ),
     ),
@@ -66,22 +66,22 @@ array (
     array (
       0 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 11,
       ),
       1 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 36,
       ),
       2 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 36,
       ),
       3 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 11,
       ),
     ),
@@ -95,22 +95,22 @@ array (
     array (
       0 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 13,
       ),
       1 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 38,
       ),
       2 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 38,
       ),
       3 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 13,
       ),
     ),
@@ -124,22 +124,22 @@ array (
     array (
       0 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 16,
       ),
       1 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 41,
       ),
       2 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 41,
       ),
       3 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 16,
       ),
     ),
@@ -153,22 +153,22 @@ array (
     array (
       0 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 18,
       ),
       1 => 
       array (
-        0 => 19,
+        0 => 20,
         1 => 43,
       ),
       2 => 
       array (
-        0 => 20,
+        0 => 21,
         1 => 45,
       ),
       3 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 20,
       ),
     ),
@@ -182,22 +182,22 @@ array (
     array (
       0 => 
       array (
-        0 => 64,
+        0 => 65,
         1 => 22,
       ),
       1 => 
       array (
-        0 => 21,
+        0 => 22,
         1 => 47,
       ),
       2 => 
       array (
-        0 => 22,
+        0 => 23,
         1 => 48,
       ),
       3 => 
       array (
-        0 => 65,
+        0 => 66,
         1 => 23,
       ),
     ),
@@ -211,22 +211,22 @@ array (
     array (
       0 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 25,
       ),
       1 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 50,
       ),
       2 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 50,
       ),
       3 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 25,
       ),
     ),
@@ -240,22 +240,22 @@ array (
     array (
       0 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 29,
       ),
       1 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 54,
       ),
       2 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 54,
       ),
       3 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 29,
       ),
     ),
@@ -269,22 +269,22 @@ array (
     array (
       0 => 
       array (
-        0 => 70,
+        0 => 71,
         1 => 32,
       ),
       1 => 
       array (
-        0 => 27,
+        0 => 28,
         1 => 57,
       ),
       2 => 
       array (
-        0 => 28,
+        0 => 29,
         1 => 59,
       ),
       3 => 
       array (
-        0 => 71,
+        0 => 72,
         1 => 34,
       ),
     ),
@@ -298,22 +298,22 @@ array (
     array (
       0 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 37,
       ),
       1 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 62,
       ),
       2 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 62,
       ),
       3 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 37,
       ),
     ),
@@ -327,22 +327,22 @@ array (
     array (
       0 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 39,
       ),
       1 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 64,
       ),
       2 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 64,
       ),
       3 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 39,
       ),
     ),
@@ -356,22 +356,22 @@ array (
     array (
       0 => 
       array (
-        0 => 75,
+        0 => 76,
         1 => 41,
       ),
       1 => 
       array (
-        0 => 32,
+        0 => 33,
         1 => 66,
       ),
       2 => 
       array (
-        0 => 33,
+        0 => 34,
         1 => 67,
       ),
       3 => 
       array (
-        0 => 76,
+        0 => 77,
         1 => 42,
       ),
     ),
@@ -385,22 +385,22 @@ array (
     array (
       0 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 44,
       ),
       1 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 69,
       ),
       2 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 69,
       ),
       3 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 44,
       ),
     ),
@@ -414,22 +414,22 @@ array (
     array (
       0 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 48,
       ),
       1 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 73,
       ),
       2 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 73,
       ),
       3 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 48,
       ),
     ),
@@ -443,22 +443,22 @@ array (
     array (
       0 => 
       array (
-        0 => 80,
+        0 => 81,
         1 => 49,
       ),
       1 => 
       array (
-        0 => 37,
+        0 => 38,
         1 => 74,
       ),
       2 => 
       array (
-        0 => 38,
+        0 => 39,
         1 => 76,
       ),
       3 => 
       array (
-        0 => 81,
+        0 => 82,
         1 => 51,
       ),
     ),
@@ -472,22 +472,22 @@ array (
     array (
       0 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 55,
       ),
       1 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 80,
       ),
       2 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 80,
       ),
       3 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 55,
       ),
     ),
@@ -501,22 +501,22 @@ array (
     array (
       0 => 
       array (
-        0 => 84,
+        0 => 85,
         1 => 56,
       ),
       1 => 
       array (
-        0 => 41,
+        0 => 42,
         1 => 81,
       ),
       2 => 
       array (
-        0 => 42,
+        0 => 43,
         1 => 83,
       ),
       3 => 
       array (
-        0 => 85,
+        0 => 86,
         1 => 58,
       ),
     ),
@@ -530,22 +530,22 @@ array (
     array (
       0 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 60,
       ),
       1 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 85,
       ),
       2 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 85,
       ),
       3 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 60,
       ),
     ),
@@ -559,22 +559,22 @@ array (
     array (
       0 => 
       array (
-        0 => 87,
+        0 => 88,
         1 => 61,
       ),
       1 => 
       array (
-        0 => 44,
+        0 => 45,
         1 => 86,
       ),
       2 => 
       array (
-        0 => 45,
+        0 => 46,
         1 => 88,
       ),
       3 => 
       array (
-        0 => 88,
+        0 => 89,
         1 => 63,
       ),
     ),
@@ -588,22 +588,22 @@ array (
     array (
       0 => 
       array (
-        0 => 89,
+        0 => 90,
         1 => 65,
       ),
       1 => 
       array (
-        0 => 46,
+        0 => 47,
         1 => 90,
       ),
       2 => 
       array (
-        0 => 47,
+        0 => 48,
         1 => 92,
       ),
       3 => 
       array (
-        0 => 90,
+        0 => 91,
         1 => 67,
       ),
     ),
@@ -617,22 +617,22 @@ array (
     array (
       0 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 68,
       ),
       1 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 93,
       ),
       2 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 93,
       ),
       3 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 68,
       ),
     ),
@@ -646,22 +646,22 @@ array (
     array (
       0 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 72,
       ),
       1 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 97,
       ),
       2 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 97,
       ),
       3 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 72,
       ),
     ),
@@ -675,22 +675,22 @@ array (
     array (
       0 => 
       array (
-        0 => 95,
+        0 => 96,
         1 => 75,
       ),
       1 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 100,
       ),
       2 => 
       array (
-        0 => 53,
+        0 => 54,
         1 => 102,
       ),
       3 => 
       array (
-        0 => 96,
+        0 => 97,
         1 => 77,
       ),
     ),
@@ -704,22 +704,22 @@ array (
     array (
       0 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 79,
       ),
       1 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 104,
       ),
       2 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 104,
       ),
       3 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 79,
       ),
     ),
@@ -733,22 +733,22 @@ array (
     array (
       0 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 82,
       ),
       1 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 107,
       ),
       2 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 107,
       ),
       3 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 82,
       ),
     ),
@@ -762,22 +762,22 @@ array (
     array (
       0 => 
       array (
-        0 => 100,
+        0 => 101,
         1 => 84,
       ),
       1 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 109,
       ),
       2 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 111,
       ),
       3 => 
       array (
-        0 => 101,
+        0 => 102,
         1 => 86,
       ),
     ),
@@ -791,22 +791,22 @@ array (
     array (
       0 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 89,
       ),
       1 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 114,
       ),
       2 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 114,
       ),
       3 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 89,
       ),
     ),
@@ -820,22 +820,22 @@ array (
     array (
       0 => 
       array (
-        0 => 104,
+        0 => 105,
         1 => 91,
       ),
       1 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 116,
       ),
       2 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 118,
       ),
       3 => 
       array (
-        0 => 105,
+        0 => 106,
         1 => 93,
       ),
     ),
@@ -849,22 +849,22 @@ array (
     array (
       0 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 94,
       ),
       1 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 119,
       ),
       2 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 119,
       ),
       3 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 94,
       ),
     ),
@@ -878,18 +878,18 @@ array (
     array (
       0 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
       1 => 
       array (
-        0 => 112,
+        0 => 113,
         1 => 103,
       ),
       2 => 
       array (
         0 => 57,
-        1 => 135,
+        1 => 136,
       ),
       3 => 
       array (
@@ -898,7 +898,7 @@ array (
       ),
       4 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
     ),

tests/Zend/Barcode/Object/_files/Int25_0123456789_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 118,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -879,7 +879,7 @@ array (
     'position' => 
     array (
       0 => 59,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_oriented_instructions.php

@@ -8,7 +8,7 @@ array (
     array (
       0 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
       1 => 
@@ -23,7 +23,7 @@ array (
       ),
       3 => 
       array (
-        0 => 111,
+        0 => 112,
         1 => 102,
       ),
     ),
@@ -37,22 +37,22 @@ array (
     array (
       0 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
       1 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       2 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       3 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
     ),
@@ -66,22 +66,22 @@ array (
     array (
       0 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
       1 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       2 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       3 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
     ),
@@ -95,22 +95,22 @@ array (
     array (
       0 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
       1 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       2 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       3 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
     ),
@@ -124,22 +124,22 @@ array (
     array (
       0 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
       1 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       2 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       3 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
     ),
@@ -153,22 +153,22 @@ array (
     array (
       0 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 17,
       ),
       1 => 
       array (
-        0 => 19,
+        0 => 20,
         1 => 42,
       ),
       2 => 
       array (
-        0 => 20,
+        0 => 21,
         1 => 44,
       ),
       3 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 19,
       ),
     ),
@@ -182,22 +182,22 @@ array (
     array (
       0 => 
       array (
-        0 => 64,
+        0 => 65,
         1 => 20,
       ),
       1 => 
       array (
-        0 => 21,
+        0 => 22,
         1 => 45,
       ),
       2 => 
       array (
-        0 => 22,
+        0 => 23,
         1 => 47,
       ),
       3 => 
       array (
-        0 => 65,
+        0 => 66,
         1 => 22,
       ),
     ),
@@ -211,22 +211,22 @@ array (
     array (
       0 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
       1 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       2 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       3 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
     ),
@@ -240,22 +240,22 @@ array (
     array (
       0 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
       1 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       2 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       3 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
     ),
@@ -269,22 +269,22 @@ array (
     array (
       0 => 
       array (
-        0 => 70,
+        0 => 71,
         1 => 31,
       ),
       1 => 
       array (
-        0 => 27,
+        0 => 28,
         1 => 56,
       ),
       2 => 
       array (
-        0 => 28,
+        0 => 29,
         1 => 57,
       ),
       3 => 
       array (
-        0 => 71,
+        0 => 72,
         1 => 32,
       ),
     ),
@@ -298,22 +298,22 @@ array (
     array (
       0 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
       1 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       2 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       3 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
     ),
@@ -327,22 +327,22 @@ array (
     array (
       0 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
       1 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       2 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       3 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
     ),
@@ -356,22 +356,22 @@ array (
     array (
       0 => 
       array (
-        0 => 75,
+        0 => 76,
         1 => 39,
       ),
       1 => 
       array (
-        0 => 32,
+        0 => 33,
         1 => 64,
       ),
       2 => 
       array (
-        0 => 33,
+        0 => 34,
         1 => 66,
       ),
       3 => 
       array (
-        0 => 76,
+        0 => 77,
         1 => 41,
       ),
     ),
@@ -385,22 +385,22 @@ array (
     array (
       0 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
       1 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       2 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       3 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
     ),
@@ -414,22 +414,22 @@ array (
     array (
       0 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
       1 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       2 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       3 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
     ),
@@ -443,22 +443,22 @@ array (
     array (
       0 => 
       array (
-        0 => 80,
+        0 => 81,
         1 => 48,
       ),
       1 => 
       array (
-        0 => 37,
+        0 => 38,
         1 => 73,
       ),
       2 => 
       array (
-        0 => 38,
+        0 => 39,
         1 => 75,
       ),
       3 => 
       array (
-        0 => 81,
+        0 => 82,
         1 => 50,
       ),
     ),
@@ -472,22 +472,22 @@ array (
     array (
       0 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
       1 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       2 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       3 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
     ),
@@ -501,22 +501,22 @@ array (
     array (
       0 => 
       array (
-        0 => 84,
+        0 => 85,
         1 => 55,
       ),
       1 => 
       array (
-        0 => 41,
+        0 => 42,
         1 => 80,
       ),
       2 => 
       array (
-        0 => 42,
+        0 => 43,
         1 => 82,
       ),
       3 => 
       array (
-        0 => 85,
+        0 => 86,
         1 => 57,
       ),
     ),
@@ -530,22 +530,22 @@ array (
     array (
       0 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
       1 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       2 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       3 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
     ),
@@ -559,22 +559,22 @@ array (
     array (
       0 => 
       array (
-        0 => 87,
+        0 => 88,
         1 => 60,
       ),
       1 => 
       array (
-        0 => 44,
+        0 => 45,
         1 => 85,
       ),
       2 => 
       array (
-        0 => 45,
+        0 => 46,
         1 => 87,
       ),
       3 => 
       array (
-        0 => 88,
+        0 => 89,
         1 => 62,
       ),
     ),
@@ -588,22 +588,22 @@ array (
     array (
       0 => 
       array (
-        0 => 89,
+        0 => 90,
         1 => 64,
       ),
       1 => 
       array (
-        0 => 46,
+        0 => 47,
         1 => 89,
       ),
       2 => 
       array (
-        0 => 47,
+        0 => 48,
         1 => 90,
       ),
       3 => 
       array (
-        0 => 90,
+        0 => 91,
         1 => 65,
       ),
     ),
@@ -617,22 +617,22 @@ array (
     array (
       0 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
       1 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       2 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       3 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
     ),
@@ -646,22 +646,22 @@ array (
     array (
       0 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
       1 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       2 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       3 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
     ),
@@ -675,22 +675,22 @@ array (
     array (
       0 => 
       array (
-        0 => 95,
+        0 => 96,
         1 => 74,
       ),
       1 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 99,
       ),
       2 => 
       array (
-        0 => 53,
+        0 => 54,
         1 => 101,
       ),
       3 => 
       array (
-        0 => 96,
+        0 => 97,
         1 => 76,
       ),
     ),
@@ -704,22 +704,22 @@ array (
     array (
       0 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
       1 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       2 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       3 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
     ),
@@ -733,22 +733,22 @@ array (
     array (
       0 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
       1 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       2 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       3 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
     ),
@@ -762,22 +762,22 @@ array (
     array (
       0 => 
       array (
-        0 => 100,
+        0 => 101,
         1 => 83,
       ),
       1 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 108,
       ),
       2 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 109,
       ),
       3 => 
       array (
-        0 => 101,
+        0 => 102,
         1 => 84,
       ),
     ),
@@ -791,22 +791,22 @@ array (
     array (
       0 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
       1 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       2 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       3 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
     ),
@@ -820,22 +820,22 @@ array (
     array (
       0 => 
       array (
-        0 => 104,
+        0 => 105,
         1 => 90,
       ),
       1 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 115,
       ),
       2 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 116,
       ),
       3 => 
       array (
-        0 => 105,
+        0 => 106,
         1 => 91,
       ),
     ),
@@ -849,22 +849,22 @@ array (
     array (
       0 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
       1 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       2 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       3 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
     ),
@@ -879,7 +879,7 @@ array (
     'position' => 
     array (
       0 => 30,
-      1 => 81,
+      1 => 82,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_stretchtext_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 118,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -879,7 +879,7 @@ array (
     'position' => 
     array (
       0 => 14,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -894,7 +894,7 @@ array (
     'position' => 
     array (
       0 => 24,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -909,7 +909,7 @@ array (
     'position' => 
     array (
       0 => 34,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -924,7 +924,7 @@ array (
     'position' => 
     array (
       0 => 44,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -939,7 +939,7 @@ array (
     'position' => 
     array (
       0 => 54,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -954,7 +954,7 @@ array (
     'position' => 
     array (
       0 => 64,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -969,7 +969,7 @@ array (
     'position' => 
     array (
       0 => 74,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -984,7 +984,7 @@ array (
     'position' => 
     array (
       0 => 84,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -999,7 +999,7 @@ array (
     'position' => 
     array (
       0 => 94,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1014,7 +1014,7 @@ array (
     'position' => 
     array (
       0 => 104,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Int25_0123456789_stretchtext_oriented_instructions.php

@@ -8,7 +8,7 @@ array (
     array (
       0 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 0,
       ),
       1 => 
@@ -23,7 +23,7 @@ array (
       ),
       3 => 
       array (
-        0 => 111,
+        0 => 112,
         1 => 102,
       ),
     ),
@@ -37,22 +37,22 @@ array (
     array (
       0 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
       1 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       2 => 
       array (
-        0 => 14,
+        0 => 15,
         1 => 33,
       ),
       3 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 8,
       ),
     ),
@@ -66,22 +66,22 @@ array (
     array (
       0 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
       1 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       2 => 
       array (
-        0 => 15,
+        0 => 16,
         1 => 35,
       ),
       3 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 10,
       ),
     ),
@@ -95,22 +95,22 @@ array (
     array (
       0 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
       1 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       2 => 
       array (
-        0 => 16,
+        0 => 17,
         1 => 37,
       ),
       3 => 
       array (
-        0 => 59,
+        0 => 60,
         1 => 12,
       ),
     ),
@@ -124,22 +124,22 @@ array (
     array (
       0 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
       1 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       2 => 
       array (
-        0 => 18,
+        0 => 19,
         1 => 40,
       ),
       3 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 15,
       ),
     ),
@@ -153,22 +153,22 @@ array (
     array (
       0 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 17,
       ),
       1 => 
       array (
-        0 => 19,
+        0 => 20,
         1 => 42,
       ),
       2 => 
       array (
-        0 => 20,
+        0 => 21,
         1 => 44,
       ),
       3 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 19,
       ),
     ),
@@ -182,22 +182,22 @@ array (
     array (
       0 => 
       array (
-        0 => 64,
+        0 => 65,
         1 => 20,
       ),
       1 => 
       array (
-        0 => 21,
+        0 => 22,
         1 => 45,
       ),
       2 => 
       array (
-        0 => 22,
+        0 => 23,
         1 => 47,
       ),
       3 => 
       array (
-        0 => 65,
+        0 => 66,
         1 => 22,
       ),
     ),
@@ -211,22 +211,22 @@ array (
     array (
       0 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
       1 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       2 => 
       array (
-        0 => 23,
+        0 => 24,
         1 => 49,
       ),
       3 => 
       array (
-        0 => 66,
+        0 => 67,
         1 => 24,
       ),
     ),
@@ -240,22 +240,22 @@ array (
     array (
       0 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
       1 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       2 => 
       array (
-        0 => 25,
+        0 => 26,
         1 => 52,
       ),
       3 => 
       array (
-        0 => 68,
+        0 => 69,
         1 => 27,
       ),
     ),
@@ -269,22 +269,22 @@ array (
     array (
       0 => 
       array (
-        0 => 70,
+        0 => 71,
         1 => 31,
       ),
       1 => 
       array (
-        0 => 27,
+        0 => 28,
         1 => 56,
       ),
       2 => 
       array (
-        0 => 28,
+        0 => 29,
         1 => 57,
       ),
       3 => 
       array (
-        0 => 71,
+        0 => 72,
         1 => 32,
       ),
     ),
@@ -298,22 +298,22 @@ array (
     array (
       0 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
       1 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       2 => 
       array (
-        0 => 30,
+        0 => 31,
         1 => 61,
       ),
       3 => 
       array (
-        0 => 73,
+        0 => 74,
         1 => 36,
       ),
     ),
@@ -327,22 +327,22 @@ array (
     array (
       0 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
       1 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       2 => 
       array (
-        0 => 31,
+        0 => 32,
         1 => 63,
       ),
       3 => 
       array (
-        0 => 74,
+        0 => 75,
         1 => 38,
       ),
     ),
@@ -356,22 +356,22 @@ array (
     array (
       0 => 
       array (
-        0 => 75,
+        0 => 76,
         1 => 39,
       ),
       1 => 
       array (
-        0 => 32,
+        0 => 33,
         1 => 64,
       ),
       2 => 
       array (
-        0 => 33,
+        0 => 34,
         1 => 66,
       ),
       3 => 
       array (
-        0 => 76,
+        0 => 77,
         1 => 41,
       ),
     ),
@@ -385,22 +385,22 @@ array (
     array (
       0 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
       1 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       2 => 
       array (
-        0 => 34,
+        0 => 35,
         1 => 68,
       ),
       3 => 
       array (
-        0 => 77,
+        0 => 78,
         1 => 43,
       ),
     ),
@@ -414,22 +414,22 @@ array (
     array (
       0 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
       1 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       2 => 
       array (
-        0 => 36,
+        0 => 37,
         1 => 71,
       ),
       3 => 
       array (
-        0 => 79,
+        0 => 80,
         1 => 46,
       ),
     ),
@@ -443,22 +443,22 @@ array (
     array (
       0 => 
       array (
-        0 => 80,
+        0 => 81,
         1 => 48,
       ),
       1 => 
       array (
-        0 => 37,
+        0 => 38,
         1 => 73,
       ),
       2 => 
       array (
-        0 => 38,
+        0 => 39,
         1 => 75,
       ),
       3 => 
       array (
-        0 => 81,
+        0 => 82,
         1 => 50,
       ),
     ),
@@ -472,22 +472,22 @@ array (
     array (
       0 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
       1 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       2 => 
       array (
-        0 => 40,
+        0 => 41,
         1 => 78,
       ),
       3 => 
       array (
-        0 => 83,
+        0 => 84,
         1 => 53,
       ),
     ),
@@ -501,22 +501,22 @@ array (
     array (
       0 => 
       array (
-        0 => 84,
+        0 => 85,
         1 => 55,
       ),
       1 => 
       array (
-        0 => 41,
+        0 => 42,
         1 => 80,
       ),
       2 => 
       array (
-        0 => 42,
+        0 => 43,
         1 => 82,
       ),
       3 => 
       array (
-        0 => 85,
+        0 => 86,
         1 => 57,
       ),
     ),
@@ -530,22 +530,22 @@ array (
     array (
       0 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
       1 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       2 => 
       array (
-        0 => 43,
+        0 => 44,
         1 => 83,
       ),
       3 => 
       array (
-        0 => 86,
+        0 => 87,
         1 => 58,
       ),
     ),
@@ -559,22 +559,22 @@ array (
     array (
       0 => 
       array (
-        0 => 87,
+        0 => 88,
         1 => 60,
       ),
       1 => 
       array (
-        0 => 44,
+        0 => 45,
         1 => 85,
       ),
       2 => 
       array (
-        0 => 45,
+        0 => 46,
         1 => 87,
       ),
       3 => 
       array (
-        0 => 88,
+        0 => 89,
         1 => 62,
       ),
     ),
@@ -588,22 +588,22 @@ array (
     array (
       0 => 
       array (
-        0 => 89,
+        0 => 90,
         1 => 64,
       ),
       1 => 
       array (
-        0 => 46,
+        0 => 47,
         1 => 89,
       ),
       2 => 
       array (
-        0 => 47,
+        0 => 48,
         1 => 90,
       ),
       3 => 
       array (
-        0 => 90,
+        0 => 91,
         1 => 65,
       ),
     ),
@@ -617,22 +617,22 @@ array (
     array (
       0 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
       1 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       2 => 
       array (
-        0 => 48,
+        0 => 49,
         1 => 92,
       ),
       3 => 
       array (
-        0 => 91,
+        0 => 92,
         1 => 67,
       ),
     ),
@@ -646,22 +646,22 @@ array (
     array (
       0 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
       1 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       2 => 
       array (
-        0 => 50,
+        0 => 51,
         1 => 96,
       ),
       3 => 
       array (
-        0 => 93,
+        0 => 94,
         1 => 71,
       ),
     ),
@@ -675,22 +675,22 @@ array (
     array (
       0 => 
       array (
-        0 => 95,
+        0 => 96,
         1 => 74,
       ),
       1 => 
       array (
-        0 => 52,
+        0 => 53,
         1 => 99,
       ),
       2 => 
       array (
-        0 => 53,
+        0 => 54,
         1 => 101,
       ),
       3 => 
       array (
-        0 => 96,
+        0 => 97,
         1 => 76,
       ),
     ),
@@ -704,22 +704,22 @@ array (
     array (
       0 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
       1 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       2 => 
       array (
-        0 => 54,
+        0 => 55,
         1 => 102,
       ),
       3 => 
       array (
-        0 => 97,
+        0 => 98,
         1 => 77,
       ),
     ),
@@ -733,22 +733,22 @@ array (
     array (
       0 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
       1 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       2 => 
       array (
-        0 => 56,
+        0 => 57,
         1 => 106,
       ),
       3 => 
       array (
-        0 => 99,
+        0 => 100,
         1 => 81,
       ),
     ),
@@ -762,22 +762,22 @@ array (
     array (
       0 => 
       array (
-        0 => 100,
+        0 => 101,
         1 => 83,
       ),
       1 => 
       array (
-        0 => 57,
+        0 => 58,
         1 => 108,
       ),
       2 => 
       array (
-        0 => 58,
+        0 => 59,
         1 => 109,
       ),
       3 => 
       array (
-        0 => 101,
+        0 => 102,
         1 => 84,
       ),
     ),
@@ -791,22 +791,22 @@ array (
     array (
       0 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
       1 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       2 => 
       array (
-        0 => 60,
+        0 => 61,
         1 => 113,
       ),
       3 => 
       array (
-        0 => 103,
+        0 => 104,
         1 => 88,
       ),
     ),
@@ -820,22 +820,22 @@ array (
     array (
       0 => 
       array (
-        0 => 104,
+        0 => 105,
         1 => 90,
       ),
       1 => 
       array (
-        0 => 61,
+        0 => 62,
         1 => 115,
       ),
       2 => 
       array (
-        0 => 62,
+        0 => 63,
         1 => 116,
       ),
       3 => 
       array (
-        0 => 105,
+        0 => 106,
         1 => 91,
       ),
     ),
@@ -849,22 +849,22 @@ array (
     array (
       0 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
       1 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       2 => 
       array (
-        0 => 63,
+        0 => 64,
         1 => 118,
       ),
       3 => 
       array (
-        0 => 106,
+        0 => 107,
         1 => 93,
       ),
     ),
@@ -879,7 +879,7 @@ array (
     'position' => 
     array (
       0 => 8,
-      1 => 42,
+      1 => 43,
     ),
     'font' => '',
     'color' => 0,
@@ -894,7 +894,7 @@ array (
     'position' => 
     array (
       0 => 13,
-      1 => 51,
+      1 => 52,
     ),
     'font' => '',
     'color' => 0,
@@ -924,7 +924,7 @@ array (
     'position' => 
     array (
       0 => 23,
-      1 => 68,
+      1 => 69,
     ),
     'font' => '',
     'color' => 0,
@@ -954,7 +954,7 @@ array (
     'position' => 
     array (
       0 => 33,
-      1 => 85,
+      1 => 86,
     ),
     'font' => '',
     'color' => 0,
@@ -984,7 +984,7 @@ array (
     'position' => 
     array (
       0 => 42,
-      1 => 102,
+      1 => 103,
     ),
     'font' => '',
     'color' => 0,
@@ -999,7 +999,7 @@ array (
     'position' => 
     array (
       0 => 47,
-      1 => 111,
+      1 => 112,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Itf14_0000123456789_bearerbar_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 154,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1227,7 +1227,7 @@ array (
     'position' => 
     array (
       0 => 77,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Itf14_0000123456789_border_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       2 => 
       array (
         0 => 156,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
@@ -1179,12 +1179,12 @@ array (
       2 => 
       array (
         0 => 156,
-        1 => 64,
+        1 => 65,
       ),
       3 => 
       array (
         0 => 0,
-        1 => 64,
+        1 => 65,
       ),
       4 => 
       array (
@@ -1203,7 +1203,7 @@ array (
     'position' => 
     array (
       0 => 78,
-      1 => 62,
+      1 => 63,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Itf14_0000123456789_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 154,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1169,7 +1169,7 @@ array (
     'position' => 
     array (
       0 => 77,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Object/_files/Itf14_0000123456789_stretchtext_instructions.php

@@ -14,12 +14,12 @@ array (
       1 => 
       array (
         0 => 0,
-        1 => 60,
+        1 => 61,
       ),
       2 => 
       array (
         0 => 154,
-        1 => 60,
+        1 => 61,
       ),
       3 => 
       array (
@@ -1169,7 +1169,7 @@ array (
     'position' => 
     array (
       0 => 14,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1184,7 +1184,7 @@ array (
     'position' => 
     array (
       0 => 24,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1199,7 +1199,7 @@ array (
     'position' => 
     array (
       0 => 34,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1214,7 +1214,7 @@ array (
     'position' => 
     array (
       0 => 43,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1229,7 +1229,7 @@ array (
     'position' => 
     array (
       0 => 53,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1244,7 +1244,7 @@ array (
     'position' => 
     array (
       0 => 63,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1259,7 +1259,7 @@ array (
     'position' => 
     array (
       0 => 72,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1274,7 +1274,7 @@ array (
     'position' => 
     array (
       0 => 82,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1289,7 +1289,7 @@ array (
     'position' => 
     array (
       0 => 91,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1304,7 +1304,7 @@ array (
     'position' => 
     array (
       0 => 101,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1319,7 +1319,7 @@ array (
     'position' => 
     array (
       0 => 111,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1334,7 +1334,7 @@ array (
     'position' => 
     array (
       0 => 120,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1349,7 +1349,7 @@ array (
     'position' => 
     array (
       0 => 130,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,
@@ -1364,7 +1364,7 @@ array (
     'position' => 
     array (
       0 => 140,
-      1 => 60,
+      1 => 61,
     ),
     'font' => '',
     'color' => 0,

tests/Zend/Barcode/Renderer/ImageTest.php

@@ -154,9 +154,9 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
     public function testGoodUserHeight()
     {
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $this->_renderer->setBarcode($barcode);
-        $this->_renderer->setHeight(61);
+        $this->_renderer->setHeight(62);
         $this->assertTrue($this->_renderer->checkParams());
     }
 
@@ -166,9 +166,9 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
     public function testBadUserHeightLessThanBarcodeHeight()
     {
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $this->_renderer->setBarcode($barcode);
-        $this->_renderer->setHeight(60);
+        $this->_renderer->setHeight(61);
         $this->_renderer->checkParams();
     }
 
@@ -200,8 +200,8 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
                     'GD extension is required to run this test');
         }
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
-        $imageResource = imagecreatetruecolor(500, 61);
+        $this->assertEquals(62, $barcode->getHeight());
+        $imageResource = imagecreatetruecolor(500, 62);
         $this->_renderer->setResource($imageResource);
         $this->_renderer->setBarcode($barcode);
         $this->assertTrue($this->_renderer->checkParams());
@@ -217,9 +217,9 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
                     'GD extension is required to run this test');
         }
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $this->_renderer->setBarcode($barcode);
-        $imageResource = imagecreatetruecolor(500, 60);
+        $imageResource = imagecreatetruecolor(500, 61);
         $this->_renderer->setResource($imageResource);
         $this->_renderer->checkParams();
     }

tests/Zend/Barcode/Renderer/PdfTest.php

@@ -120,7 +120,7 @@ class Zend_Barcode_Renderer_PdfTest extends Zend_Barcode_Renderer_TestCommon
     {
         $renderer = $this->_getRendererWithWidth500AndHeight300();
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $renderer->setBarcode($barcode);
         $renderer->setVerticalPosition('middle');
         $renderer->draw();
@@ -131,10 +131,10 @@ class Zend_Barcode_Renderer_PdfTest extends Zend_Barcode_Renderer_TestCommon
     {
         $renderer = $this->_getRendererWithWidth500AndHeight300();
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $renderer->setBarcode($barcode);
         $renderer->setVerticalPosition('bottom');
         $renderer->draw();
-        $this->assertEquals(269.5, $renderer->getTopOffset());
+        $this->assertEquals(269, $renderer->getTopOffset());
     }
 }

tests/Zend/Barcode/Renderer/TestCommon.php

@@ -277,7 +277,7 @@ abstract class Zend_Barcode_Renderer_TestCommon extends PHPUnit_Framework_TestCa
         $renderer = $this->_getRendererWithWidth500AndHeight300();
         $renderer->setModuleSize(1);
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $renderer->setBarcode($barcode);
         $renderer->setVerticalPosition('top');
         $renderer->draw();
@@ -289,7 +289,7 @@ abstract class Zend_Barcode_Renderer_TestCommon extends PHPUnit_Framework_TestCa
         $renderer = $this->_getRendererWithWidth500AndHeight300();
         $renderer->setModuleSize(1);
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $renderer->setBarcode($barcode);
         $renderer->setVerticalPosition('middle');
         $renderer->draw();
@@ -301,10 +301,10 @@ abstract class Zend_Barcode_Renderer_TestCommon extends PHPUnit_Framework_TestCa
         $renderer = $this->_getRendererWithWidth500AndHeight300();
         $renderer->setModuleSize(1);
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
-        $this->assertEquals(61, $barcode->getHeight());
+        $this->assertEquals(62, $barcode->getHeight());
         $renderer->setBarcode($barcode);
         $renderer->setVerticalPosition('bottom');
         $renderer->draw();
-        $this->assertEquals(239, $renderer->getTopOffset());
+        $this->assertEquals(238, $renderer->getTopOffset());
     }
 }