Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12816] XoopsModules/modulepacks/x257basicmodulepack/ trunk/xoops_lib/vendor/tcpdf
|
From: <be...@us...> - 2014-10-19 04:35:34
|
Revision: 12816
http://sourceforge.net/p/xoops/svn/12816
Author: beckmi
Date: 2014-10-19 04:35:29 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
Cosmetic changes
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,48 +0,0 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
-
-1. Author(s)
---------------------------------
-Initial author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
-Initial TCPDF version : 6.0.093
-Programmers having been adaptation and optimization for Xoops
-- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
-- Philodenelle - www.chg-web.org - phi...@ch...
-
-2. Minimum required
---------------------------------
-- Xoops 2.5.7
-- PHP 5.3.17
-
-3. Installing TCPDF_for_Xoops
---------------------------------
-Xoops 2.5.7 and higher
-- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
-- Check the following directories have write access
- * ./xoops_lib/vendor/tcpdf/fonts
- * ./xoops_lib/vendor/tcpdf/cache
- * ./xoops_lib/vendor/tcpdf/images
-- For specifics characters (japanese, korean, chinese, taiwanese) download
- the specific font (see below) and copy the directory ./Frameworks/tcpdf/fonts or ./language/fonts
- * For Chinese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_simplified_font_tcpdf_for_xoops.zip/download
- * For Taiwan character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_taiwan_font_tcpdf_for_xoops.zip/download
- * For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
- * For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-
-4. Update TCPDF_for_xoops
---------------------------------
-Xoops 2.5.0 - 2.5.6
-- This version
-
-Xoops 2.5.7 and higher
-- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-
-
-5. Convert a font for TCPDF_for_Xoops
---------------------------------
-- Using the addTTFfont() method you can directly create a TCPDF font starting
- from a TrueType, OpenType or Type1 font.
- NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
-
- For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,4 +1,4 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
+TCPDF_for_XOOPS Version 2.01 - 2014-09-13
1. Author(s)
--------------------------------
@@ -13,11 +13,11 @@
- Xoops 2.5.7
- PHP 5.3.17
-3. Installing TCPDF_for_Xoops
+3. Installing TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.7 and higher
- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
+- replace files makepdf.php for modules you need
- Check the following directories have write access
* ./xoops_lib/vendor/tcpdf/fonts
* ./xoops_lib/vendor/tcpdf/cache
@@ -29,7 +29,7 @@
* For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
* For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-4. Update TCPDF_for_xoops
+4. Update TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.0 - 2.5.6
- This version
@@ -38,11 +38,11 @@
- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-5. Convert a font for TCPDF_for_Xoops
+5. Convert a font for TCPDF_for_XOOPS
--------------------------------
- Using the addTTFfont() method you can directly create a TCPDF font starting
from a TrueType, OpenType or Type1 font.
NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
+ $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -0,0 +1,10 @@
+CREDITS
+===============
+
+The TCPDF Library is developed by Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
+
+The adaptation and optimization for XOOPS have been done by:
+- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
+- Philodenelle - www.chg-web.org - phi...@ch...
+
+For changes: please see changelog.txt
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -323,7 +323,7 @@
}
// get char
$chr = ord($data[$pos + $charscount]);
- $charscount++;
+ ++$charscount;
// STEP L
if ($this->isCharMode($chr, ENC_ASCII_NUM)) {
$numch[ENC_ASCII] += (1 / 2);
@@ -636,17 +636,17 @@
$tcw = (($temp_cw[0] & 0x3F) << 2) + (($temp_cw[1] & 0x30) >> 4);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw= (($temp_cw[1] & 0x0F) << 4) + (($temp_cw[2] & 0x3C) >> 2);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw = (($temp_cw[2] & 0x03) << 6) + ($temp_cw[3] & 0x3F);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$temp_cw = array();
$pos = $epos;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -214,7 +214,7 @@
$len = count($frame);
// the frame is square (width = height)
foreach ($frame as &$frameLine) {
- for ($i=0; $i<$len; $i++) {
+ for ($i=0; $i<$len; ++$i) {
$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
}
}
@@ -247,10 +247,10 @@
$this->dir = -1;
$this->bit = -1;
// inteleaved data and ecc codes
- for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+ for ($i=0; $i < ($this->dataLength + $this->eccLength); ++$i) {
$code = $this->getCode();
$bit = 0x80;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
$bit = $bit >> 1;
@@ -258,7 +258,7 @@
}
// remainder bits
$j = $this->getRemainder($this->version);
- for ($i=0; $i<$j; $i++) {
+ for ($i=0; $i<$j; ++$i) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02);
}
@@ -295,7 +295,7 @@
$x--;
$this->bit++;
} else {
- $x++;
+ ++$x;
$y += $this->dir;
$this->bit--;
}
@@ -345,7 +345,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
if ($this->rsBlockNum2($spec) == 0) return 0;
$dl = $this->rsDataCodes2($spec);
@@ -364,7 +364,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
return 0;
}
@@ -525,7 +525,7 @@
$this->runLength[$head] = 1;
} elseif ($x > 0) {
if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -544,7 +544,7 @@
$this->runLength[$head] = 1;
} elseif ($y > 0) {
if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -614,7 +614,7 @@
$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
$p = 0;
while($this->isdigitat($this->dataStr, $p)) {
- $p++;
+ ++$p;
}
$run = $p;
$mode = $this->identifyMode($p);
@@ -641,7 +641,7 @@
if ($this->isdigitat($this->dataStr, $p)) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsModeAn($p) // + 4 + la
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -652,7 +652,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -685,7 +685,7 @@
if ($mode == QR_MODE_NM) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -698,7 +698,7 @@
} elseif ($mode == QR_MODE_AN) {
$q = $p;
while($this->isalnumat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeAn($q - $p) + 4 + $la
@@ -709,7 +709,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -756,7 +756,7 @@
$p += 2;
} else {
if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
- $p++;
+ ++$p;
}
}
return $this->dataStr;
@@ -1167,7 +1167,7 @@
} else {
$bstream[$p] = 0;
}
- $p++;
+ ++$p;
$mask = $mask >> 1;
}
}
@@ -1195,21 +1195,21 @@
$data = array_fill(0, (int)(($size + 7) / 8), 0);
$bytes = (int)($size / 8);
$p = 0;
- for ($i=0; $i<$bytes; $i++) {
+ for ($i=0; $i<$bytes; ++$i) {
$v = 0;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$i] = $v;
}
if ($size & 7) {
$v = 0;
- for ($j=0; $j<($size & 7); $j++) {
+ for ($j=0; $j<($size & 7); ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$bytes] = $v;
}
@@ -1295,7 +1295,7 @@
);
$yStart = $oy - 2;
$xStart = $ox - 2;
- for ($y=0; $y < 5; $y++) {
+ for ($y=0; $y < 5; ++$y) {
$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
}
return $frame;
@@ -1351,7 +1351,7 @@
"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
);
- for ($y=0; $y < 7; $y++) {
+ for ($y=0; $y < 7; ++$y) {
$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
}
return $frame;
@@ -1509,7 +1509,7 @@
}
$rs['iprim'] = (int)($iprim / $prim);
$rs['genpoly'][0] = 1;
- for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
+ for ($i = 0,$root=$fcr*$prim; $i < $nroots; ++$i, $root += $prim) {
$rs['genpoly'][$i+1] = 1;
// Multiply rs->genpoly[] by @**(root + x)
for ($j = $i; $j > 0; --$j) {
@@ -1541,7 +1541,7 @@
$PAD =& $rs['pad']; // the number of pad symbols in a block
$A0 =& $NN;
$parity = array_fill(0, $NROOTS, 0);
- for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+ for ($i=0; $i < ($NN - $NROOTS - $PAD); ++$i) {
$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
if ($feedback != $A0) {
// feedback term is non-zero
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -726,21 +726,21 @@
$pfile .= '// Japanese'."\n";
$pfile .= '$enc=\'UniJIS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Japan1\',\'Supplement\'=>5);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
case 'CID0KR': {
$pfile .= '// Korean'."\n";
$pfile .= '$enc=\'UniKS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Korea1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ak12.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ak12.php\');'."\n";
break;
}
case 'CID0CS': {
$pfile .= '// Chinese Simplified'."\n";
$pfile .= '$enc=\'UniGB-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'GB1\',\'Supplement\'=>2);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ag15.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ag15.php\');'."\n";
break;
}
case 'CID0CT':
@@ -748,7 +748,7 @@
$pfile .= '// Chinese Traditional'."\n";
$pfile .= '$enc=\'UniCNS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'CNS1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
}
@@ -997,7 +997,7 @@
$subsetglyphs[$g] = true;
}
}
- }
+ }
break;
}
case 6: { // Format 6: Trimmed table mapping
@@ -1393,7 +1393,7 @@
return $map;
}
public static function _getfontpath() {
- if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
+ if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(__DIR__.'/../fonts'))) {
if (substr($fdir, -1) != '/') $fdir .= '/';
define('K_PATH_FONTS', $fdir);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -2486,7 +2486,7 @@
// sara u, sara uu, pinthu
$lowvowel = array(0x0e38, 0x0e39, 0x0e3a);
$output = array();
- for ($i = 0; $i < $numchars; $i++) {
+ for ($i = 0; $i < $numchars; ++$i) {
if (($unicode[$i] >= 0x0e00) && ($unicode[$i] <= 0x0e5b)) {
$ch0 = $unicode[$i];
$ch1 = ($i > 0) ? $unicode[($i - 1)] : 0;
@@ -3862,7 +3862,7 @@
if (in_array($file, $this->imagekeys)) {
// get existing image data
$info = $this->getImageBuffer($file);
- $imsize = array($info['w'], $info['h']);
+ $imsize = array($info['w'], $info['h']);
} elseif (strpos($file, '__tcpdf_img') === FALSE) {
$imgdata = TCPDF_STATIC::fileGetContents($file);
}
@@ -6388,7 +6388,7 @@
// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
if ($this->pdfa_mode OR $this->force_srgb) {
$iccobj = $this->_newobj();
- $icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
+ $icc = file_get_contents(__DIR__.'/include/sRGB.icc');
$filter = '';
if ($this->compress) {
$filter = ' /Filter /FlateDecode';
@@ -6543,7 +6543,7 @@
//$out .= ' /XFA ';
$out .= ' >>';
// signatures
- if ($this->sign AND isset($this->signature_data['cert_type'])
+ if ($this->sign AND isset($this->signature_data['cert_type'])
AND (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A'))) {
if ($this->signature_data['cert_type'] > 0) {
$out .= ' /Perms << /DocMDP '.($this->sig_obj_id + 1).' 0 R >>';
@@ -10330,7 +10330,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_1d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -10624,7 +10624,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_2d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -12599,7 +12599,7 @@
$spacew = ($spacewidth * $ns);
}
$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
- $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
+ $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
if ($epsposend !== null) {
$epsposend += strlen($this->epsmarker.'Q');
$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -668,7 +668,7 @@
// create a bar-space sequence
$seq = '';
$chrlen = strlen($chr[$char_bar]);
- for ($s = 0; $s < $chrlen; $s++){
+ for ($s = 0; $s < $chrlen; ++$s){
$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
}
$seqlen = strlen($seq);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -135,14 +135,14 @@
$qrtype = strtoupper($mode[0]);
switch ($qrtype) {
case 'DATAMATRIX': { // DATAMATRIX (ISO/IEC 16022)
- require_once(dirname(__FILE__).'/include/barcodes/datamatrix.php');
+ require_once(__DIR__.'/include/barcodes/datamatrix.php');
$qrcode = new Datamatrix($code);
$this->barcode_array = $qrcode->getBarcodeArray();
$this->barcode_array['code'] = $code;
break;
}
case 'PDF417': { // PDF417 (ISO/IEC 15438:2006)
- require_once(dirname(__FILE__).'/include/barcodes/pdf417.php');
+ require_once(__DIR__.'/include/barcodes/pdf417.php');
if (!isset($mode[1]) OR ($mode[1] === '')) {
$aspectratio = 2; // default aspect ratio (width / height)
} else {
@@ -173,7 +173,7 @@
break;
}
case 'QRCODE': { // QR-CODE
- require_once(dirname(__FILE__).'/include/barcodes/qrcode.php');
+ require_once(__DIR__.'/include/barcodes/qrcode.php');
if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
$mode[1] = 'L'; // Ddefault: Low error correction
}
@@ -223,4 +223,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,6 +1,6 @@
<?php
if (!defined('XOOPS_ROOT_PATH')) die('XOOPS root path not defined');
-require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
+require_once(__DIR__.'/include/tcpdf_filters.php');
class TCPDF_PARSER {
private $pdfdata = '';
protected $xref = array();
@@ -595,4 +595,4 @@
}
}
-}
\ No newline at end of file
+}
|
