diff --git a/index.php b/index.php
index 547854c..312e711 100755
--- a/index.php
+++ b/index.php
@@ -256,7 +256,7 @@ if (badQuery()) {
         require "phpqrcode.php";
 
         $cheminImage = "temp/" . generateRandomString($fileNameLenght) . ".png";
-        QRcode::png($_GET['txt'], $cheminImage, $_GET['redondancy'], $_GET['size'], $_GET['margin'], false, hexdec($_GET['bgColor']), hexdec($_GET['mainColor']));
+        QRcode::png($_GET['txt'], $cheminImage, $_GET['redondancy'], $_GET['size'], $_GET['margin'], false, hexdec(substr($_GET['bgColor'], -6)), hexdec(substr($_GET['mainColor'], -6)));
         ?>
         <div class="centered">
           <a href="<?php echo $cheminImage; ?>" class="button" download="<?php echo htmlspecialchars($_GET['txt']); ?>.png"><?= $loc['button_download'] ?></a>
diff --git a/phpqrcode.php b/phpqrcode.php
index c2c92f0..035ff25 100755
--- a/phpqrcode.php
+++ b/phpqrcode.php
@@ -33,8 +33,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
- 
+
+
 
 /*
  * Version: 1.1.4
@@ -74,9 +74,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
 	// Encoding modes
-	 
+
 	define('QR_MODE_NUL', -1);
 	define('QR_MODE_NUM', 0);
 	define('QR_MODE_AN', 1);
@@ -90,17 +90,17 @@
 	define('QR_ECLEVEL_M', 1);
 	define('QR_ECLEVEL_Q', 2);
 	define('QR_ECLEVEL_H', 3);
-	
+
 	// Supported output formats
-	
+
 	define('QR_FORMAT_TEXT', 0);
 	define('QR_FORMAT_PNG',  1);
-	
+
 	class qrstr {
 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
 			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
 		}
-	}	
+	}
 
 
 
@@ -114,17 +114,17 @@
  *
  * Config file, tuned-up for merged verion
  */
-     
+
     define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there
     define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true
-    define('QR_LOG_DIR', false);         // default error logs dir   
-    
+    define('QR_LOG_DIR', false);         // default error logs dir
+
     define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
     define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
     define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
-                                                  
+
     define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
-                                                  
+
 
 
 
@@ -157,63 +157,63 @@
  */
 
     class QRtools {
-    
+
         //----------------------------------------------------------------------
         public static function binarize($frame)
         {
             $len = count($frame);
             foreach ($frame as &$frameLine) {
-                
+
                 for($i=0; $i<$len; $i++) {
                     $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
                 }
             }
-            
+
             return $frame;
         }
-        
+
         //----------------------------------------------------------------------
         public static function tcpdfBarcodeArray($code, $mode = 'QR,L', $tcPdfVersion = '4.5.037')
         {
             $barcode_array = array();
-            
+
             if (!is_array($mode))
                 $mode = explode(',', $mode);
-                
+
             $eccLevel = 'L';
-                
+
             if (count($mode) > 1) {
                 $eccLevel = $mode[1];
             }
-                
+
             $qrTab = QRcode::text($code, false, $eccLevel);
             $size = count($qrTab);
-                
+
             $barcode_array['num_rows'] = $size;
             $barcode_array['num_cols'] = $size;
             $barcode_array['bcode'] = array();
-                
+
             foreach ($qrTab as $line) {
                 $arrAdd = array();
                 foreach(str_split($line) as $char)
                     $arrAdd[] = ($char=='1')?1:0;
                 $barcode_array['bcode'][] = $arrAdd;
             }
-                    
+
             return $barcode_array;
         }
-        
+
         //----------------------------------------------------------------------
         public static function clearCache()
         {
             self::$frames = array();
         }
-        
+
         //----------------------------------------------------------------------
         public static function buildCache()
         {
 			QRtools::markTime('before_build_cache');
-			
+
 			$mask = new QRmask();
             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
                 $frame = QRspec::newFrame($a);
@@ -221,13 +221,13 @@
                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);
                 }
-				
+
 				$width = count($frame);
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
 				for ($maskNo=0; $maskNo<8; $maskNo++)
 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
             }
-			
+
 			QRtools::markTime('after_build_cache');
         }
 
@@ -241,12 +241,12 @@
                     } else {
                         file_put_contents(QR_LOG_DIR.'errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
                     }
-                }    
+                }
             }
         }
-        
+
         //----------------------------------------------------------------------
-        public static function dumpMask($frame) 
+        public static function dumpMask($frame)
         {
             $width = count($frame);
             for($y=0;$y<$width;$y++) {
@@ -255,24 +255,24 @@
                 }
             }
         }
-        
+
         //----------------------------------------------------------------------
         public static function markTime($markerId)
         {
             list($usec, $sec) = explode(" ", microtime());
             $time = ((float)$usec + (float)$sec);
-            
+
             if (!isset($GLOBALS['qr_time_bench']))
                 $GLOBALS['qr_time_bench'] = array();
-            
+
             $GLOBALS['qr_time_bench'][$markerId] = $time;
         }
-        
+
         //----------------------------------------------------------------------
         public static function timeBenchmark()
         {
             self::markTime('finish');
-        
+
             $lastTime = 0;
             $startTime = 0;
             $p = 0;
@@ -287,19 +287,19 @@
                 } else {
                     $startTime = $thisTime;
                 }
-                
+
                 $p++;
                 $lastTime = $thisTime;
             }
-            
+
             echo '</tbody><tfoot>
                 <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
             </tfoot>
             </table>';
         }
-        
+
         public static function save($content, $filename_path)
-        {           
+        {
             try {
                 $handle = fopen($filename_path, "w");
                 fwrite($handle, $content);
@@ -307,16 +307,16 @@
                 return true;
             } catch (Exception $e) {
                 echo 'Exception reçue : ',  $e->getMessage(), "\n";
-            }      
-            
+            }
+
         }
-        
+
     }
-    
+
     //##########################################################################
-    
+
     QRtools::markTime('start');
-    
+
 
 
 
@@ -339,7 +339,7 @@
  * The following data / specifications are taken from
  * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004)
  *  or
- * "Automatic identification and data capture techniques -- 
+ * "Automatic identification and data capture techniques --
  *  QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006)
  *
  * This library is free software; you can redistribute it and/or
@@ -356,7 +356,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
     define('QRSPEC_VERSION_MAX', 40);
     define('QRSPEC_WIDTH_MAX',   177);
 
@@ -366,7 +366,7 @@
     define('QRCAP_EC',           3);
 
     class QRspec {
-    
+
         public static $capacity = array(
             array(  0,    0, 0, array(   0,    0,    0,    0)),
             array( 21,   26, 0, array(   7,   10,   13,   17)), // 1
@@ -410,59 +410,59 @@
             array(173, 3532, 0, array( 720, 1316, 1950, 2310)),
             array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40
         );
-        
+
         //----------------------------------------------------------------------
         public static function getDataLength($version, $level)
         {
             return self::$capacity[$version][QRCAP_WORDS] - self::$capacity[$version][QRCAP_EC][$level];
         }
-        
+
         //----------------------------------------------------------------------
         public static function getECCLength($version, $level)
         {
             return self::$capacity[$version][QRCAP_EC][$level];
         }
-        
+
         //----------------------------------------------------------------------
         public static function getWidth($version)
         {
             return self::$capacity[$version][QRCAP_WIDTH];
         }
-        
+
         //----------------------------------------------------------------------
         public static function getRemainder($version)
         {
             return self::$capacity[$version][QRCAP_REMINDER];
         }
-        
+
         //----------------------------------------------------------------------
         public static function getMinimumVersion($size, $level)
         {
 
             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
-                if($words >= $size) 
+                if($words >= $size)
                     return $i;
             }
 
             return -1;
         }
-    
+
         //######################################################################
-        
+
         public static $lengthTableBits = array(
             array(10, 12, 14),
             array( 9, 11, 13),
             array( 8, 16, 16),
             array( 8, 10, 12)
         );
-        
+
         //----------------------------------------------------------------------
         public static function lengthIndicator($mode, $version)
         {
             if ($mode == QR_MODE_STRUCTURE)
                 return 0;
-                
+
             if ($version <= 9) {
                 $l = 0;
             } else if ($version <= 26) {
@@ -473,13 +473,13 @@
 
             return self::$lengthTableBits[$mode][$l];
         }
-        
+
         //----------------------------------------------------------------------
         public static function maximumWords($mode, $version)
         {
-            if($mode == QR_MODE_STRUCTURE) 
+            if($mode == QR_MODE_STRUCTURE)
                 return 3;
-                
+
             if($version <= 9) {
                 $l = 0;
             } else if($version <= 26) {
@@ -490,7 +490,7 @@
 
             $bits = self::$lengthTableBits[$mode][$l];
             $words = (1 << $bits) - 1;
-            
+
             if($mode == QR_MODE_KANJI) {
                 $words *= 2; // the number of bytes is required
             }
@@ -544,11 +544,11 @@
             array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),
             array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),
             array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40
-        );                                                                       
+        );
 
         //----------------------------------------------------------------------
         // CACHEABLE!!!
-        
+
         public static function getEccSpec($version, $level, array &$spec)
         {
             if (count($spec) < 5) {
@@ -564,7 +564,7 @@
                 $spec[0] = $b1;
                 $spec[1] = (int)($data / $b1);
                 $spec[2] = (int)($ecc / $b1);
-                $spec[3] = 0; 
+                $spec[3] = 0;
                 $spec[4] = 0;
             } else {
                 $spec[0] = $b1;
@@ -578,13 +578,13 @@
         // Alignment pattern ---------------------------------------------------
 
         // Positions of alignment patterns.
-        // This array includes only the second and the third position of the 
-        // alignment patterns. Rest of them can be calculated from the distance 
+        // This array includes only the second and the third position of the
+        // alignment patterns. Rest of them can be calculated from the distance
         // between them.
-         
+
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
-         
-        public static $alignmentPattern = array(      
+
+        public static $alignmentPattern = array(
             array( 0,  0),
             array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5
             array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
@@ -594,9 +594,9 @@
             array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), //26-30
             array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), //31-35
             array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58), //35-40
-        );                                                                                  
+        );
+
 
-        
         /** --------------------------------------------------------------------
          * Put an alignment marker.
          * @param frame
@@ -611,11 +611,11 @@
                 "\xa1\xa0\xa1\xa0\xa1",
                 "\xa1\xa0\xa0\xa0\xa1",
                 "\xa1\xa1\xa1\xa1\xa1"
-            );                        
-            
-            $yStart = $oy-2;         
+            );
+
+            $yStart = $oy-2;
             $xStart = $ox-2;
-            
+
             for($y=0; $y<5; $y++) {
                 QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);
             }
@@ -663,9 +663,9 @@
 
 		// Version information pattern (BCH coded).
         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
-        
+
 		// size: [QRSPEC_VERSION_MAX - 6]
-		
+
         public static $versionPattern = array(
             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
             0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9,
@@ -685,7 +685,7 @@
 
         // Format information --------------------------------------------------
         // See calcFormatInfo in tests/test_qrspec.c (orginal qrencode c lib)
-        
+
         public static $formatInfo = array(
             array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976),
             array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0),
@@ -697,16 +697,16 @@
         {
             if($mask < 0 || $mask > 7)
                 return 0;
-                
+
             if($level < 0 || $level > 3)
-                return 0;                
+                return 0;
 
             return self::$formatInfo[$level][$mask];
         }
 
         // Frame ---------------------------------------------------------------
         // Cache of initial frames.
-         
+
         public static $frames = array();
 
         /** --------------------------------------------------------------------
@@ -725,8 +725,8 @@
                 "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
                 "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
-            );                            
-            
+            );
+
             for($y=0; $y<7; $y++) {
                 QRstr::set($frame, $ox, $oy+$y, $finder[$y]);
             }
@@ -743,28 +743,28 @@
             self::putFinderPattern($frame, 0, 0);
             self::putFinderPattern($frame, $width - 7, 0);
             self::putFinderPattern($frame, 0, $width - 7);
-            
+
             // Separator
             $yOffset = $width - 7;
-            
+
             for($y=0; $y<7; $y++) {
                 $frame[$y][7] = "\xc0";
                 $frame[$y][$width - 8] = "\xc0";
                 $frame[$yOffset][7] = "\xc0";
                 $yOffset++;
             }
-            
+
             $setPattern = str_repeat("\xc0", 8);
-            
+
             QRstr::set($frame, 0, 7, $setPattern);
             QRstr::set($frame, $width-8, 7, $setPattern);
             QRstr::set($frame, 0, $width - 8, $setPattern);
-        
+
             // Format info
             $setPattern = str_repeat("\x84", 9);
             QRstr::set($frame, 0, 8, $setPattern);
             QRstr::set($frame, $width - 8, 8, $setPattern, 8);
-            
+
             $yOffset = $width - 8;
 
             for($y=0; $y<8; $y++,$yOffset++) {
@@ -772,22 +772,22 @@
                 $frame[$yOffset][8] = "\x84";
             }
 
-            // Timing pattern  
-            
+            // Timing pattern
+
             for($i=1; $i<$width-15; $i++) {
                 $frame[6][7+$i] = chr(0x90 | ($i & 1));
                 $frame[7+$i][6] = chr(0x90 | ($i & 1));
             }
-            
-            // Alignment pattern  
+
+            // Alignment pattern
             self::putAlignmentPattern($version, $frame, $width);
-            
-            // Version information 
+
+            // Version information
             if($version >= 7) {
                 $vinf = self::getVersionPattern($version);
 
                 $v = $vinf;
-                
+
                 for($x=0; $x<6; $x++) {
                     for($y=0; $y<3; $y++) {
                         $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
@@ -803,10 +803,10 @@
                     }
                 }
             }
-    
-            // and a little bit...  
+
+            // and a little bit...
             $frame[$width - 8][8] = "\x81";
-            
+
             return $frame;
         }
 
@@ -814,12 +814,12 @@
         public static function debug($frame, $binary_mode = false)
         {
             if ($binary_mode) {
-            
+
                     foreach ($frame as &$frameLine) {
                         $frameLine = join('<span class="m">&nbsp;&nbsp;</span>', explode('0', $frameLine));
                         $frameLine = join('&#9608;&#9608;', explode('1', $frameLine));
                     }
-                    
+
                     ?>
                 <style>
                     .m { background-color: white; }
@@ -828,9 +828,9 @@
                     echo '<pre><tt><br/ ><br/ ><br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                     echo join("<br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $frame);
                     echo '</tt></pre><br/ ><br/ ><br/ ><br/ ><br/ ><br/ >';
-            
+
             } else {
-            
+
                 foreach ($frame as &$frameLine) {
                     $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));
                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));
@@ -846,7 +846,7 @@
                     $frameLine = join('&#9830;', explode("\x01", $frameLine));
                     $frameLine = join('&#8901;', explode("\0", $frameLine));
                 }
-                
+
                 ?>
                 <style>
                     .p { background-color: yellow; }
@@ -860,7 +860,7 @@
                 echo "<pre><tt>";
                 echo join("<br/ >", $frame);
                 echo "</tt></pre>";
-            
+
             }
         }
 
@@ -869,23 +869,23 @@
         {
             return gzcompress(join("\n", $frame), 9);
         }
-        
+
         //----------------------------------------------------------------------
         public static function unserial($code)
         {
             return explode("\n", gzuncompress($code));
         }
-        
+
         //----------------------------------------------------------------------
         public static function newFrame($version)
         {
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
+            if($version < 1 || $version > QRSPEC_VERSION_MAX)
                 return null;
 
             if(!isset(self::$frames[$version])) {
-                
+
                 $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';
-                
+
                 if (QR_CACHEABLE) {
                     if (file_exists($fileName)) {
                         self::$frames[$version] = self::unserial(file_get_contents($fileName));
@@ -897,7 +897,7 @@
                     self::$frames[$version] = self::createFrame($version);
                 }
             }
-            
+
             if(is_null(self::$frames[$version]))
                 return null;
 
@@ -914,7 +914,7 @@
         public static function rsEccCodes2($spec)    { return $spec[2]; }
         public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }
         public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }
-        
+
     }
 
 
@@ -952,7 +952,7 @@
     class QRimage {
 
         //----------------------------------------------------------------------
-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color, $fore_color)
+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000)
         {
             $image = self::image($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color);
 
@@ -1064,43 +1064,43 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
     define('STRUCTURE_HEADER_BITS',  20);
     define('MAX_STRUCTURED_SYMBOLS', 16);
 
     class QRinputItem {
-    
+
         public $mode;
         public $size;
         public $data;
         public $bstream;
 
-        public function __construct($mode, $size, $data, $bstream = null) 
+        public function __construct($mode, $size, $data, $bstream = null)
         {
             $setData = array_slice($data, 0, $size);
-            
+
             if (count($setData) < $size) {
                 $setData = array_merge($setData, array_fill(0,$size-count($setData),0));
             }
-        
+
             if(!QRinput::check($mode, $size, $setData)) {
                 throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));
             }
-            
+
             $this->mode = $mode;
             $this->size = $size;
             $this->data = $setData;
             $this->bstream = $bstream;
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeModeNum($version)
         {
             try {
-            
+
                 $words = (int)($this->size / 3);
                 $bs = new QRbitstream();
-                
+
                 $val = 0x1;
                 $bs->appendNum(4, $val);
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);
@@ -1123,19 +1123,19 @@
 
                 $this->bstream = $bs;
                 return 0;
-                
+
             } catch (Exception $e) {
                 return -1;
             }
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeModeAn($version)
         {
             try {
                 $words = (int)($this->size / 2);
                 $bs = new QRbitstream();
-                
+
                 $bs->appendNum(4, 0x02);
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);
 
@@ -1150,15 +1150,15 @@
                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));
                     $bs->appendNum(6, $val);
                 }
-        
+
                 $this->bstream = $bs;
                 return 0;
-            
+
             } catch (Exception $e) {
                 return -1;
             }
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeMode8($version)
         {
@@ -1174,19 +1174,19 @@
 
                 $this->bstream = $bs;
                 return 0;
-            
+
             } catch (Exception $e) {
                 return -1;
             }
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeModeKanji($version)
         {
             try {
 
                 $bs = new QRbitrtream();
-                
+
                 $bs->appendNum(4, 0x8);
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));
 
@@ -1197,7 +1197,7 @@
                     } else {
                         $val -= 0xc140;
                     }
-                    
+
                     $h = ($val >> 8) * 0xc0;
                     $val = ($val & 0xff) + $h;
 
@@ -1206,7 +1206,7 @@
 
                 $this->bstream = $bs;
                 return 0;
-            
+
             } catch (Exception $e) {
                 return -1;
             }
@@ -1217,7 +1217,7 @@
         {
             try {
                 $bs =  new QRbitstream();
-                
+
                 $bs->appendNum(4, 0x03);
                 $bs->appendNum(4, ord($this->data[1]) - 1);
                 $bs->appendNum(4, ord($this->data[0]) - 1);
@@ -1225,18 +1225,18 @@
 
                 $this->bstream = $bs;
                 return 0;
-            
+
             } catch (Exception $e) {
                 return -1;
             }
         }
-        
+
         //----------------------------------------------------------------------
         public function estimateBitStreamSizeOfEntry($version)
         {
             $bits = 0;
 
-            if($version == 0) 
+            if($version == 0)
                 $version = 1;
 
             switch($this->mode) {
@@ -1244,7 +1244,7 @@
                 case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
                 case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
                 case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
+                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;
                 default:
                     return 0;
             }
@@ -1257,83 +1257,83 @@
 
             return $bits;
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeBitStream($version)
         {
             try {
-            
+
                 unset($this->bstream);
                 $words = QRspec::maximumWords($this->mode, $version);
-                
+
                 if($this->size > $words) {
-                
+
                     $st1 = new QRinputItem($this->mode, $words, $this->data);
                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));
 
                     $st1->encodeBitStream($version);
                     $st2->encodeBitStream($version);
-                    
+
                     $this->bstream = new QRbitstream();
                     $this->bstream->append($st1->bstream);
                     $this->bstream->append($st2->bstream);
-                    
+
                     unset($st1);
                     unset($st2);
-                    
+
                 } else {
-                    
+
                     $ret = 0;
-                    
+
                     switch($this->mode) {
                         case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
                         case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
                         case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
                         case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
                         case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
-                        
+
                         default:
                             break;
                     }
-                    
+
                     if($ret < 0)
                         return -1;
                 }
 
                 return $this->bstream->size();
-            
+
             } catch (Exception $e) {
                 return -1;
             }
         }
     };
-    
+
     //##########################################################################
 
     class QRinput {
 
         public $items;
-        
+
         private $version;
         private $level;
-        
+
         //----------------------------------------------------------------------
         public function __construct($version = 0, $level = QR_ECLEVEL_L)
         {
             if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) {
                 throw new Exception('Invalid version no');
             }
-            
+
             $this->version = $version;
             $this->level = $level;
         }
-        
+
         //----------------------------------------------------------------------
         public function getVersion()
         {
             return $this->version;
         }
-        
+
         //----------------------------------------------------------------------
         public function setVersion($version)
         {
@@ -1346,7 +1346,7 @@
 
             return 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function getErrorCorrectionLevel()
         {
@@ -1365,13 +1365,13 @@
 
             return 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function appendEntry(QRinputItem $entry)
         {
             $this->items[] = $entry;
         }
-        
+
         //----------------------------------------------------------------------
         public function append($mode, $size, $data)
         {
@@ -1383,21 +1383,21 @@
                 return -1;
             }
         }
-        
+
         //----------------------------------------------------------------------
-        
+
         public function insertStructuredAppendHeader($size, $index, $parity)
         {
             if( $size > MAX_STRUCTURED_SYMBOLS ) {
                 throw new Exception('insertStructuredAppendHeader wrong size');
             }
-            
+
             if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
                 throw new Exception('insertStructuredAppendHeader wrong index');
             }
 
             $buf = array($size, $index, $parity);
-            
+
             try {
                 $entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf);
                 array_unshift($this->items, $entry);
@@ -1411,7 +1411,7 @@
         public function calcParity()
         {
             $parity = 0;
-            
+
             foreach($this->items as $item) {
                 if($item->mode != QR_MODE_STRUCTURE) {
                     for($i=$item->size-1; $i>=0; $i--) {
@@ -1422,7 +1422,7 @@
 
             return $parity;
         }
-        
+
         //----------------------------------------------------------------------
         public static function checkModeNum($size, $data)
         {
@@ -1440,7 +1440,7 @@
         {
             $w = (int)$size / 3;
             $bits = $w * 10;
-            
+
             switch($size - $w * 3) {
                 case 1:
                     $bits += 4;
@@ -1454,7 +1454,7 @@
 
             return $bits;
         }
-        
+
         //----------------------------------------------------------------------
         public static $anTable = array(
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1466,13 +1466,13 @@
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
         );
-        
+
         //----------------------------------------------------------------------
         public static function lookAnTable($c)
         {
             return (($c > 127)?-1:self::$anTable[$c]);
         }
-        
+
         //----------------------------------------------------------------------
         public static function checkModeAn($size, $data)
         {
@@ -1484,32 +1484,32 @@
 
             return true;
         }
-        
+
         //----------------------------------------------------------------------
         public static function estimateBitsModeAn($size)
         {
             $w = (int)($size / 2);
             $bits = $w * 11;
-            
+
             if($size & 1) {
                 $bits += 6;
             }
 
             return $bits;
         }
-    
+
         //----------------------------------------------------------------------
         public static function estimateBitsMode8($size)
         {
             return $size * 8;
         }
-        
+
         //----------------------------------------------------------------------
         public function estimateBitsModeKanji($size)
         {
             return (int)(($size / 2) * 13);
         }
-        
+
         //----------------------------------------------------------------------
         public static function checkModeKanji($size, $data)
         {
@@ -1518,8 +1518,8 @@
 
             for($i=0; $i<$size; $i+=2) {
                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-                if( $val < 0x8140 
-                || ($val > 0x9ffc && $val < 0xe040) 
+                if( $val < 0x8140
+                || ($val > 0x9ffc && $val < 0xe040)
                 || $val > 0xebbf) {
                     return false;
                 }
@@ -1534,7 +1534,7 @@
 
         public static function check($mode, $size, $data)
         {
-            if($size <= 0) 
+            if($size <= 0)
                 return false;
 
             switch($mode) {
@@ -1543,15 +1543,15 @@
                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
                 case QR_MODE_8:         return true; break;
                 case QR_MODE_STRUCTURE: return true; break;
-                
+
                 default:
                     break;
             }
 
             return false;
         }
-        
-        
+
+
         //----------------------------------------------------------------------
         public function estimateBitStreamSize($version)
         {
@@ -1563,7 +1563,7 @@
 
             return $bits;
         }
-        
+
         //----------------------------------------------------------------------
         public function estimateVersion()
         {
@@ -1580,7 +1580,7 @@
 
             return $version;
         }
-        
+
         //----------------------------------------------------------------------
         public static function lengthOfCode($mode, $version, $bits)
         {
@@ -1600,7 +1600,7 @@
                     $chunks = (int)($payload / 11);
                     $remain = $payload - $chunks * 11;
                     $size = $chunks * 2;
-                    if($remain >= 6) 
+                    if($remain >= 6)
                         $size++;
                     break;
                 case QR_MODE_8:
@@ -1616,14 +1616,14 @@
                     $size = 0;
                     break;
             }
-            
+
             $maxsize = QRspec::maximumWords($mode, $version);
             if($size < 0) $size = 0;
             if($size > $maxsize) $size = $maxsize;
 
             return $size;
         }
-        
+
         //----------------------------------------------------------------------
         public function createBitStream()
         {
@@ -1631,16 +1631,16 @@
 
             foreach($this->items as $item) {
                 $bits = $item->encodeBitStream($this->version);
-                
-                if($bits < 0) 
+
+                if($bits < 0)
                     return -1;
-                    
+
                 $total += $bits;
             }
 
             return $total;
         }
-        
+
         //----------------------------------------------------------------------
         public function convertData()
         {
@@ -1651,10 +1651,10 @@
 
             for(;;) {
                 $bits = $this->createBitStream();
-                
-                if($bits < 0) 
+
+                if($bits < 0)
                     return -1;
-                    
+
                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
                 if($ver < 0) {
                     throw new Exception('WRONG VERSION');
@@ -1667,7 +1667,7 @@
 
             return 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function appendPaddingBit(&$bstream)
         {
@@ -1688,28 +1688,28 @@
 
             $padding = new QRbitstream();
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
-            
-            if($ret < 0) 
+
+            if($ret < 0)
                 return $ret;
 
             $padlen = $maxwords - $words;
-            
+
             if($padlen > 0) {
-                
+
                 $padbuf = array();
                 for($i=0; $i<$padlen; $i++) {
                     $padbuf[$i] = ($i&1)?0x11:0xec;
                 }
-                
+
                 $ret = $padding->appendBytes($padlen, $padbuf);
-                
+
                 if($ret < 0)
                     return $ret;
-                
+
             }
 
             $ret = $bstream->append($padding);
-            
+
             return $ret;
         }
 
@@ -1721,7 +1721,7 @@
             }
 
             $bstream = new QRbitstream();
-            
+
             foreach($this->items as $item) {
                 $ret = $bstream->append($item->bstream);
                 if($ret < 0) {
@@ -1737,11 +1737,11 @@
         {
 
             $bstream = $this->mergeBitStream();
-            
+
             if($bstream == null) {
                 return null;
             }
-            
+
             $ret = $this->appendPaddingBit($bstream);
             if($ret < 0) {
                 return null;
@@ -1749,7 +1749,7 @@
 
             return $bstream;
         }
-        
+
         //----------------------------------------------------------------------
         public function getByteStream()
         {
@@ -1757,13 +1757,13 @@
             if($bstream == null) {
                 return null;
             }
-            
+
             return $bstream->toByte();
         }
     }
-        
-        
-    
+
+
+
 
 
 
@@ -1797,30 +1797,30 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-     
+
     class QRbitstream {
-    
+
         public $data = array();
-        
+
         //----------------------------------------------------------------------
         public function size()
         {
             return count($this->data);
         }
-        
+
         //----------------------------------------------------------------------
         public function allocate($setLength)
         {
             $this->data = array_fill(0, $setLength, 0);
             return 0;
         }
-    
+
         //----------------------------------------------------------------------
         public static function newFromNum($bits, $num)
         {
             $bstream = new QRbitstream();
             $bstream->allocate($bits);
-            
+
             $mask = 1 << ($bits - 1);
             for($i=0; $i<$bits; $i++) {
                 if($num & $mask) {
@@ -1833,7 +1833,7 @@
 
             return $bstream;
         }
-        
+
         //----------------------------------------------------------------------
         public static function newFromBytes($size, $data)
         {
@@ -1856,36 +1856,36 @@
 
             return $bstream;
         }
-        
+
         //----------------------------------------------------------------------
         public function append(QRbitstream $arg)
         {
             if (is_null($arg)) {
                 return -1;
             }
-            
+
             if($arg->size() == 0) {
                 return 0;
             }
-            
+
             if($this->size() == 0) {
                 $this->data = $arg->data;
                 return 0;
             }
-            
+
             $this->data = array_values(array_merge($this->data, $arg->data));
 
             return 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function appendNum($bits, $num)
         {
-            if ($bits == 0) 
+            if ($bits == 0)
                 return 0;
 
             $b = QRbitstream::newFromNum($bits, $num);
-            
+
             if(is_null($b))
                 return -1;
 
@@ -1898,11 +1898,11 @@
         //----------------------------------------------------------------------
         public function appendBytes($size, $data)
         {
-            if ($size == 0) 
+            if ($size == 0)
                 return 0;
 
             $b = QRbitstream::newFromBytes($size, $data);
-            
+
             if(is_null($b))
                 return -1;
 
@@ -1911,22 +1911,22 @@
 
             return $ret;
         }
-        
+
         //----------------------------------------------------------------------
         public function toByte()
         {
-        
+
             $size = $this->size();
 
             if($size == 0) {
                 return array();
             }
-            
+
             $data = array_fill(0, (int)(($size + 7) / 8), 0);
             $bytes = (int)($size / 8);
 
             $p = 0;
-            
+
             for($i=0; $i<$bytes; $i++) {
                 $v = 0;
                 for($j=0; $j<8; $j++) {
@@ -1936,7 +1936,7 @@
                 }
                 $data[$i] = $v;
             }
-            
+
             if($size & 7) {
                 $v = 0;
                 for($j=0; $j<($size & 7); $j++) {
@@ -2282,7 +2282,7 @@
  * PHP QR Code encoder
  *
  * Reed-Solomon error correction support
- * 
+ *
  * Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q
  * (libfec is released under the GNU Lesser General Public License.)
  *
@@ -2306,21 +2306,21 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
     class QRrsItem {
-    
-        public $mm;                  // Bits per symbol 
-        public $nn;                  // Symbols per block (= (1<<mm)-1) 
-        public $alpha_to = array();  // log lookup table 
-        public $index_of = array();  // Antilog lookup table 
-        public $genpoly = array();   // Generator polynomial 
-        public $nroots;              // Number of generator roots = number of parity symbols 
-        public $fcr;                 // First consecutive root, index form 
-        public $prim;                // Primitive element, index form 
-        public $iprim;               // prim-th root of 1, index form 
-        public $pad;                 // Padding bytes in shortened block 
+
+        public $mm;                  // Bits per symbol
+        public $nn;                  // Symbols per block (= (1<<mm)-1)
+        public $alpha_to = array();  // log lookup table
+        public $index_of = array();  // Antilog lookup table
+        public $genpoly = array();   // Generator polynomial
+        public $nroots;              // Number of generator roots = number of parity symbols
+        public $fcr;                 // First consecutive root, index form
+        public $prim;                // Primitive element, index form
+        public $iprim;               // prim-th root of 1, index form
+        public $pad;                 // Padding bytes in shortened block
         public $gfpoly;
-    
+
         //----------------------------------------------------------------------
         public function modnn($x)
         {
@@ -2328,10 +2328,10 @@
                 $x -= $this->nn;
                 $x = ($x >> $this->mm) + ($x & $this->nn);
             }
-            
+
             return $x;
         }
-        
+
         //----------------------------------------------------------------------
         public static function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
         {
@@ -2340,7 +2340,7 @@
             // May be used under the terms of the GNU Lesser General Public License (LGPL)
 
             $rs = null;
-            
+
             // Check parameter ranges
             if($symsize < 0 || $symsize > 8)                     return $rs;
             if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
@@ -2355,16 +2355,16 @@
 
             $rs->alpha_to = array_fill(0, $rs->nn+1, 0);
             $rs->index_of = array_fill(0, $rs->nn+1, 0);
-          
+
             // PHP style macro replacement ;)
             $NN =& $rs->nn;
             $A0 =& $NN;
-            
+
             // Generate Galois field lookup tables
             $rs->index_of[0] = $A0; // log(zero) = -inf
             $rs->alpha_to[$A0] = 0; // alpha**-inf = 0
             $sr = 1;
-          
+
             for($i=0; $i<$rs->nn; $i++) {
                 $rs->index_of[$sr] = $i;
                 $rs->alpha_to[$i] = $sr;
@@ -2374,7 +2374,7 @@
                 }
                 $sr &= $rs->nn;
             }
-            
+
             if($sr != 1){
                 // field generator polynomial is not primitive!
                 $rs = NULL;
@@ -2383,7 +2383,7 @@
 
             /* Form RS code generator polynomial from its roots */
             $rs->genpoly = array_fill(0, $nroots+1, 0);
-        
+
             $rs->fcr = $fcr;
             $rs->prim = $prim;
             $rs->nroots = $nroots;
@@ -2392,10 +2392,10 @@
             /* Find prim-th root of 1, used in decoding */
             for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)
             ; // intentional empty-body loop!
-            
+
             $rs->iprim = (int)($iprim / $prim);
             $rs->genpoly[0] = 1;
-            
+
             for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
                 $rs->genpoly[$i+1] = 1;
 
@@ -2410,14 +2410,14 @@
                 // rs->genpoly[0] can never be zero
                 $rs->genpoly[0] = $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[0]] + $root)];
             }
-            
+
             // convert rs->genpoly[] to index form for quicker encoding
             for ($i = 0; $i <= $nroots; $i++)
                 $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
 
             return $rs;
         }
-        
+
         //----------------------------------------------------------------------
         public function encode_rs_char($data, &$parity)
         {
@@ -2436,21 +2436,21 @@
             $parity = array_fill(0, $NROOTS, 0);
 
             for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {
-                
+
                 $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
-                if($feedback != $A0) {      
+                if($feedback != $A0) {
                     // feedback term is non-zero
-            
+
                     // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
                     // always be for the polynomials constructed by init_rs()
                     $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);
-            
+
                     for($j=1;$j<$NROOTS;$j++) {
                         $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];
                     }
                 }
-                
-                // Shift 
+
+                // Shift
                 array_shift($parity);
                 if($feedback != $A0) {
                     array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);
@@ -2460,13 +2460,13 @@
             }
         }
     }
-    
+
     //##########################################################################
-    
+
     class QRrs {
-    
+
         public static $items = array();
-        
+
         //----------------------------------------------------------------------
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
         {
@@ -2856,24 +2856,24 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
     class QRrsblock {
         public $dataLength;
         public $data = array();
         public $eccLength;
         public $ecc = array();
-        
+
         public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs)
         {
             $rs->encode_rs_char($data, $ecc);
-        
+
             $this->dataLength = $dl;
             $this->data = $data;
             $this->eccLength = $el;
             $this->ecc = $ecc;
         }
     };
-    
+
     //##########################################################################
 
     class QRrawcode {
@@ -2886,12 +2886,12 @@
         public $dataLength;
         public $eccLength;
         public $b1;
-        
+
         //----------------------------------------------------------------------
         public function __construct(QRinput $input)
         {
             $spec = array(0,0,0,0,0);
-            
+
             $this->datacode = $input->getByteStream();
             if(is_null($this->datacode)) {
                 throw new Exception('null imput string');
@@ -2905,7 +2905,7 @@
             $this->eccLength = QRspec::rsEccLength($spec);
             $this->ecccode = array_fill(0, $this->eccLength, 0);
             $this->blocks = QRspec::rsBlockNum($spec);
-            
+
             $ret = $this->init($spec);
             if($ret < 0) {
                 throw new Exception('block alloc error');
@@ -2914,14 +2914,14 @@
 
             $this->count = 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function init(array $spec)
         {
             $dl = QRspec::rsDataCodes1($spec);
             $el = QRspec::rsEccCodes1($spec);
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-            
+
 
             $blockNo = 0;
             $dataPos = 0;
@@ -2930,7 +2930,7 @@
                 $ecc = array_slice($this->ecccode,$eccPos);
                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
                 $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-                
+
                 $dataPos += $dl;
                 $eccPos += $el;
                 $blockNo++;
@@ -2942,14 +2942,14 @@
             $dl = QRspec::rsDataCodes2($spec);
             $el = QRspec::rsEccCodes2($spec);
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-            
+
             if($rs == NULL) return -1;
-            
+
             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
                 $ecc = array_slice($this->ecccode,$eccPos);
                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
                 $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-                
+
                 $dataPos += $dl;
                 $eccPos += $el;
                 $blockNo++;
@@ -2957,7 +2957,7 @@
 
             return 0;
         }
-        
+
         //----------------------------------------------------------------------
         public function getCode()
         {
@@ -2978,19 +2978,19 @@
                 return 0;
             }
             $this->count++;
-            
+
             return $ret;
         }
     }
 
     //##########################################################################
-    
+
     class QRcode {
-    
+
         public $version;
         public $width;
-        public $data; 
-        
+        public $data;
+
         //----------------------------------------------------------------------
         public function encodeMask(QRinput $input, $mask)
         {
@@ -3002,13 +3002,13 @@
             }
 
             $raw = new QRrawcode($input);
-            
+
             QRtools::markTime('after_raw');
-            
+
             $version = $raw->version;
             $width = QRspec::getWidth($version);
             $frame = QRspec::newFrame($version);
-            
+
             $filler = new FrameFiller($width, $frame);
             if(is_null($filler)) {
                 return NULL;
@@ -3024,26 +3024,26 @@
                     $bit = $bit >> 1;
                 }
             }
-            
+
             QRtools::markTime('after_filler');
-            
+
             unset($raw);
-            
+
             // remainder bits
             $j = QRspec::getRemainder($version);
             for($i=0; $i<$j; $i++) {
                 $addr = $filler->next();
                 $filler->setFrameAt($addr, 0x02);
             }
-            
+
             $frame = $filler->frame;
             unset($filler);
-            
-            
+
+
             // masking
             $maskObj = new QRmask();
             if($mask < 0) {
-            
+
                 if (QR_FIND_BEST_MASK) {
                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
                 } else {
@@ -3052,26 +3052,26 @@
             } else {
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
             }
-            
+
             if($masked == NULL) {
                 return NULL;
             }
-            
+
             QRtools::markTime('after_mask');
-            
+
             $this->version = $version;
             $this->width = $width;
             $this->data = $masked;
-            
+
             return $this;
         }
-    
+
         //----------------------------------------------------------------------
         public function encodeInput(QRinput $input)
         {
             return $this->encodeMask($input, -1);
         }
-        
+
         //----------------------------------------------------------------------
         public function encodeString8bit($string, $version, $level)
         {
@@ -3110,28 +3110,28 @@
 
             return $this->encodeInput($input);
         }
-        
+
         //----------------------------------------------------------------------
-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false, $back_color = 0xFFFFFF, $fore_color = 0x000000) 
+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false, $back_color = 0xFFFFFF, $fore_color = 0x000000)
         {
             $enc = QRencode::factory($level, $size, $margin, $back_color, $fore_color);
             return $enc->encodePNG($text, $outfile, $saveandprint=false);
         }
 
         //----------------------------------------------------------------------
-        public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
+        public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4)
         {
             $enc = QRencode::factory($level, $size, $margin);
             return $enc->encode($text, $outfile);
         }
-        
+
         //----------------------------------------------------------------------
-        public static function eps($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false) 
+        public static function eps($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)
         {
             $enc = QRencode::factory($level, $size, $margin, $back_color, $fore_color, $cmyk);
             return $enc->encodeEPS($text, $outfile, $saveandprint=false);
         }
-        
+
         //----------------------------------------------------------------------
         public static function svg($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false, $back_color = 0xFFFFFF, $fore_color = 0x000000)
         {
@@ -3140,24 +3140,24 @@
         }
 
         //----------------------------------------------------------------------
-        public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
+        public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4)
         {
             $enc = QRencode::factory($level, $size, $margin);
             return $enc->encodeRAW($text, $outfile);
         }
     }
-    
+
     //##########################################################################
-    
+
     class FrameFiller {
-    
+
         public $width;
         public $frame;
         public $x;
         public $y;
         public $dir;
         public $bit;
-        
+
         //----------------------------------------------------------------------
         public function __construct($width, &$frame)
         {
@@ -3168,24 +3168,24 @@
             $this->dir = -1;
             $this->bit = -1;
         }
-        
+
         //----------------------------------------------------------------------
         public function setFrameAt($at, $val)
         {
             $this->frame[$at['y']][$at['x']] = chr($val);
         }
-        
+
         //----------------------------------------------------------------------
         public function getFrameAt($at)
         {
             return ord($this->frame[$at['y']][$at['x']]);
         }
-        
+
         //----------------------------------------------------------------------
         public function next()
         {
             do {
-            
+
                 if($this->bit == -1) {
                     $this->bit = 0;
                     return array('x'=>$this->x, 'y'=>$this->y);
@@ -3231,30 +3231,30 @@
                 $this->y = $y;
 
             } while(ord($this->frame[$y][$x]) & 0x80);
-                        
+
             return array('x'=>$x, 'y'=>$y);
         }
-        
+
     } ;
-    
-    //##########################################################################    
-    
+
+    //##########################################################################
+
     class QRencode {
-    
+
         public $casesensitive = true;
         public $eightbit = false;
-        
+
         public $version = 0;
         public $size = 3;
         public $margin = 4;
         public $back_color = 0xFFFFFF;
         public $fore_color = 0x000000;
-        
+
         public $structured = 0; // not supported yet
-        
+
         public $level = QR_ECLEVEL_L;
         public $hint = QR_MODE_8;
-        
+
         //----------------------------------------------------------------------
         public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)
         {
@@ -3264,7 +3264,7 @@
             $enc->fore_color = $fore_color;
             $enc->back_color = $back_color;
             $enc->cmyk = $cmyk;
-            
+
             switch ($level.'') {
                 case '0':
                 case '1':
@@ -3289,12 +3289,12 @@
                         $enc->level = QR_ECLEVEL_H;
                     break;
             }
-            
+
             return $enc;
         }
-        
+
         //----------------------------------------------------------------------
-        public function encodeRAW($intext, $outfile = false) 
+        public function encodeRAW($intext, $outfile = false)
         {
             $code = new QRcode();
 
@@ -3303,12 +3303,12 @@
             } else {
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
             }
-            
+
             return $code->data;
         }
 
         //----------------------------------------------------------------------
-        public function encode($intext, $outfile = false) 
+        public function encode($intext, $outfile = false)
         {
             $code = new QRcode();
 
@@ -3317,85 +3317,85 @@
             } else {
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
             }
-            
+
             QRtools::markTime('after_encode');
-            
+
             if ($outfile!== false) {
                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));
             } else {
                 return QRtools::binarize($code->data);
             }
         }
-        
+
         //----------------------------------------------------------------------
-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 
+        public function encodePNG($intext, $outfile = false,$saveandprint=false)
         {
             try {
-            
+
                 ob_start();
                 $tab = $this->encode($intext);
                 $err = ob_get_contents();
                 ob_end_clean();
-                
+
                 if ($err != '')
                     QRtools::log($outfile, $err);
-                
+
                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
-                
+
                 QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint, $this->back_color, $this->fore_color);
-            
+
             } catch (Exception $e) {
-            
+
                 QRtools::log($outfile, $e->getMessage());
-            
-            }
-        }
-        
-        //----------------------------------------------------------------------
-        public function encodeEPS($intext, $outfile = false,$saveandprint=false) 
-        {
-            try {
-            
-                ob_start();
-                $tab = $this->encode($intext);
-                $err = ob_get_contents();
-                ob_end_clean();
-                
-                if ($err != '')
-                    QRtools::log($outfile, $err);
-                
-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
-                
-                QRvect::eps($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint, $this->back_color, $this->fore_color, $this->cmyk);
-            
-            } catch (Exception $e) {
-            
-                QRtools::log($outfile, $e->getMessage());
-            
+
             }
         }
 
         //----------------------------------------------------------------------
-        public function encodeSVG($intext, $outfile = false,$saveandprint=false) 
+        public function encodeEPS($intext, $outfile = false,$saveandprint=false)
         {
             try {
-            
+
                 ob_start();
                 $tab = $this->encode($intext);
                 $err = ob_get_contents();
                 ob_end_clean();
-                
+
                 if ($err != '')
                     QRtools::log($outfile, $err);
-                
+
+                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
+
+                QRvect::eps($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint, $this->back_color, $this->fore_color, $this->cmyk);
+
+            } catch (Exception $e) {
+
+                QRtools::log($outfile, $e->getMessage());
+
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public function encodeSVG($intext, $outfile = false,$saveandprint=false)
+        {
+            try {
+
+                ob_start();
+                $tab = $this->encode($intext);
+                $err = ob_get_contents();
+                ob_end_clean();
+
+                if ($err != '')
+                    QRtools::log($outfile, $err);
+
                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
 
                 QRvect::svg($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint, $this->back_color, $this->fore_color);
-            
+
             } catch (Exception $e) {
-            
+
                 QRtools::log($outfile, $e->getMessage());
-            
+
             }
         }
     }
@@ -3430,16 +3430,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
     define('QR_VECT', true);
 
     class QRvect {
-    
+
         //----------------------------------------------------------------------
-        public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false) 
+        public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)
         {
             $vect = self::vectEPS($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color, $cmyk);
-            
+
             if ($filename === false) {
                 header("Content-Type: application/postscript");
                 header('Content-Disposition: filename="qrcode.eps"');
@@ -3455,17 +3455,17 @@
                 }
             }
         }
-        
-    
+
+
         //----------------------------------------------------------------------
-        private static function vectEPS($frame, $pixelPerPoint = 4, $outerFrame = 4, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false) 
+        private static function vectEPS($frame, $pixelPerPoint = 4, $outerFrame = 4, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)
         {
             $h = count($frame);
             $w = strlen($frame[0]);
-            
+
             $imgW = $w + 2*$outerFrame;
             $imgH = $h + 2*$outerFrame;
-            
+
             if ($cmyk)
             {
                 // convert color value into decimal eps format
@@ -3496,8 +3496,8 @@
                 $g = round(($back_color & 0x0000FF) / 255, 5);
                 $back_color_string = $r.' '.$b.' '.$g.' setrgbcolor'."\n";
             }
-            
-            $output = 
+
+            $output =
             '%!PS-Adobe EPSF-3.0'."\n".
             '%%Creator: PHPQrcodeLib'."\n".
             '%%Title: QRcode'."\n".
@@ -3506,24 +3506,24 @@
             '%%LanguageLevel: 2'."\n".
             '%%Pages: 1'."\n".
             '%%BoundingBox: 0 0 '.$imgW * $pixelPerPoint.' '.$imgH * $pixelPerPoint."\n";
-            
+
             // set the scale
             $output .= $pixelPerPoint.' '.$pixelPerPoint.' scale'."\n";
             // position the center of the coordinate system
-            
+
             $output .= $outerFrame.' '.$outerFrame.' translate'."\n";
-           
-           
-            
-            
+
+
+
+
             // redefine the 'rectfill' operator to shorten the syntax
             $output .= '/F { rectfill } def'."\n";
-            
+
             // set the symbol color
             $output .= $back_color_string;
             $output .= '-'.$outerFrame.' -'.$outerFrame.' '.($w + 2*$outerFrame).' '.($h + 2*$outerFrame).' F'."\n";
-            
-            
+
+
             // set the symbol color
             $output .= $fore_color_string;
 
@@ -3538,18 +3538,18 @@
                     }
                 }
             }
-            
-            
+
+
             $output .='%%EOF';
-            
+
             return $output;
         }
-        
+
         //----------------------------------------------------------------------
-        public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color, $fore_color) 
+        public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000)
         {
             $vect = self::vectSVG($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color);
-            
+
             if ($filename === false) {
                 header("Content-Type: image/svg+xml");
                 //header('Content-Disposition: attachment, filename="qrcode.svg"');
@@ -3565,19 +3565,19 @@
                 }
             }
         }
-        
-    
+
+
         //----------------------------------------------------------------------
-        private static function vectSVG($frame, $pixelPerPoint = 4, $outerFrame = 4, $back_color = 0xFFFFFF, $fore_color = 0x000000) 
+        private static function vectSVG($frame, $pixelPerPoint = 4, $outerFrame = 4, $back_color = 0xFFFFFF, $fore_color = 0x000000)
         {
             $h = count($frame);
             $w = strlen($frame[0]);
-            
+
             $imgW = $w + 2*$outerFrame;
             $imgH = $h + 2*$outerFrame;
-            
-            
-            $output = 
+
+
+            $output =
             '<?xml version="1.0" encoding="utf-8"?>'."\n".
             '<svg version="1.1" baseProfile="full"  width="'.$imgW * $pixelPerPoint.'" height="'.$imgH * $pixelPerPoint.'" viewBox="0 0 '.$imgW * $pixelPerPoint.' '.$imgH * $pixelPerPoint.'"
              xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">'."\n".
@@ -3588,19 +3588,19 @@
             '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">'."\n".
             '<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" width="'.$imgW * $pixelPerPoint.'" height="'.$imgH * $pixelPerPoint.'" viewBox="0 0 '.$imgW * $pixelPerPoint.' '.$imgH * $pixelPerPoint.'">'."\n".
             '<desc></desc>'."\n";
-                
+
             if(!empty($back_color)) {
                 $backgroundcolor = str_pad(dechex($back_color), 6, "0", STR_PAD_LEFT);
                 $output .= '<rect width="'.$imgW * $pixelPerPoint.'" height="'.$imgH * $pixelPerPoint.'" fill="#'.$backgroundcolor.'" cx="0" cy="0" />'."\n";
             }
-                
-            $output .= 
+
+            $output .=
             '<defs>'."\n".
             '<rect id="p" width="'.$pixelPerPoint.'" height="'.$pixelPerPoint.'" />'."\n".
             '</defs>'."\n".
             '<g fill="#'.str_pad(dechex($fore_color), 6, "0", STR_PAD_LEFT).'">'."\n";
-                
-                
+
+
             // Convert the matrix into pixels
 
             for($i=0; $i<$h; $i++) {
@@ -3612,14 +3612,10 @@
                     }
                 }
             }
-            $output .= 
+            $output .=
             '</g>'."\n".
             '</svg>';
-            
+
             return $output;
         }
     }
-    
-    
-
-