From d3449c5a72937fb6ae1f7e76e12c056267e1cb5e Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 24 Jun 2010 10:53:05 +0200 Subject: [PATCH] 5.5.002 --- CHANGELOG.TXT | 5 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 522 +++++++++--------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_pdf417.php.html | 2 +- doc/com-tecnick-tcpdf/_qrcode.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- qrcode.php | 4 +- tcpdf.php | 313 ++++++++++- 23 files changed, 589 insertions(+), 299 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e48a847..d9ec9a0 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +5.5.002 (2010-06-24) + - ToUnicode Identity-H name was replaced with a full CMap (to avoid preflight syntax error). + - Bug #3020638 "str_split() not available in php4" was fixed. + - Bug #3020665 "file_get_contents() too many parameters for php4" was fixed. + 5.5.001 (2010-06-23) - A problem on image streams was fixed. diff --git a/README.TXT b/README.TXT index ff68e2c..00ce9b5 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.5.001 -Release date: 2010-06-23 +Version: 5.5.002 +Release date: 2010-06-24 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 10ffa40..73f8e20 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 2d31dce..3556100 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 8450858..66ac642 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Wed, 23 Jun 2010 10:00:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index f5445cd..1b309bb 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

@@ -732,7 +732,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.5.001 + version:  5.5.002 link:  http://www.tcpdf.org @@ -6988,7 +6988,7 @@ $diskcache = false])
-

method addExtGState [line 14118]

+

method addExtGState [line 14403]

@@ -7099,7 +7099,7 @@ $subset = 'default'])
-

method addHtmlLink [line 10159]

+

method addHtmlLink [line 10443]

@@ -7174,7 +7174,7 @@ $firstblock = false])
-

method addHTMLTOC [line 20170]

+

method addHTMLTOC [line 20455]

@@ -7237,7 +7237,7 @@ $correct_align = true])
-

method addHTMLVertSpace [line 18900]

+

method addHTMLVertSpace [line 19185]

@@ -7291,7 +7291,7 @@ $firstorlast = false])
-

method addJavascriptObject [line 12714]

+

method addJavascriptObject [line 12999]

@@ -7499,7 +7499,7 @@ $k)
-

method addTOC [line 20020]

+

method addTOC [line 20305]

@@ -7616,7 +7616,7 @@ $keepmargins = false])
-

method AliasNbPages [line 13930]

+

method AliasNbPages [line 14215]

@@ -7658,7 +7658,7 @@ $alias = '{nb}'])
-

method AliasNumPage [line 13957]

+

method AliasNumPage [line 14242]

@@ -7775,7 +7775,7 @@ $spaces = 0])
-

method Arrow [line 11923]

+

method Arrow [line 12208]

@@ -7853,7 +7853,7 @@ $arm_angle = 15])
-

method arrUTF8ToUTF16BE [line 10054]

+

method arrUTF8ToUTF16BE [line 10338]

@@ -7928,7 +7928,7 @@ $setbom = true])
-

method Bookmark [line 12591]

+

method Bookmark [line 12876]

@@ -7988,7 +7988,7 @@ $page = ''])
-

method Button [line 13603]

+

method Button [line 13888]

@@ -8192,7 +8192,7 @@ $valign = 'M'])
-

method CheckBox [line 13533]

+

method CheckBox [line 13818]

@@ -8336,7 +8336,7 @@ $addpage = true])
-

method Circle [line 11611]

+

method Circle [line 11896]

@@ -8435,7 +8435,7 @@ $angend:)
-

method Clip [line 14580]

+

method Clip [line 14865]

@@ -8526,7 +8526,7 @@ $h)
-

method closeHTMLTagHandler [line 18510]

+

method closeHTMLTagHandler [line 18795]

@@ -8586,7 +8586,7 @@ $dom)
-

method colorRegistrationBar [line 14255]

+

method colorRegistrationBar [line 14540]

@@ -8664,7 +8664,7 @@ $colors = 'A,R,G,B,C,M,Y,K'])
-

method ComboBox [line 13472]

+

method ComboBox [line 13757]

@@ -8754,7 +8754,7 @@ $js = false])
-

method commitTransaction [line 20282]

+

method commitTransaction [line 20567]

@@ -8782,7 +8782,7 @@ $js = false])
-

method convertHexStringToString [line 10782]

+

method convertHexStringToString [line 11066]

@@ -8824,7 +8824,7 @@ $bs)
-

method convertHTMLColorToDec [line 10192]

+

method convertHTMLColorToDec [line 10476]

@@ -8863,7 +8863,7 @@ $color = '#FFFFFF'])
-

method convertStringToHexString [line 10803]

+

method convertStringToHexString [line 11088]

@@ -8908,7 +8908,7 @@ $s)
-

method convertSVGtMatrix [line 21249]

+

method convertSVGtMatrix [line 21534]

@@ -8950,7 +8950,7 @@ $tm)
-

method CoonsPatchMesh [line 14495]

+

method CoonsPatchMesh [line 14780]

@@ -9058,7 +9058,7 @@ $antialias = false])
-

method copyPage [line 19952]

+

method copyPage [line 20237]

@@ -9100,7 +9100,7 @@ $page = 0])
-

method cropMark [line 14353]

+

method cropMark [line 14638]

@@ -9172,7 +9172,7 @@ $color = array(0,0,0)])
-

method Curve [line 11416]

+

method Curve [line 11701]

@@ -9274,7 +9274,7 @@ $fill_color = array()])
-

method deletePage [line 19815]

+

method deletePage [line 20100]

@@ -9316,7 +9316,7 @@ $page)
-

method Ellipse [line 11480]

+

method Ellipse [line 11765]

@@ -9436,7 +9436,7 @@ $afinish:)
-

method empty_string [line 20336]

+

method empty_string [line 20621]

@@ -9520,7 +9520,7 @@ $tocpage = false])
-

method endSVGElementHandler [line 22275]

+

method endSVGElementHandler [line 22560]

@@ -9638,7 +9638,7 @@ $msg)
-

method extractCSSproperties [line 15809]

+

method extractCSSproperties [line 16094]

@@ -9708,7 +9708,7 @@ $cssdata)
-

method formatPageNumber [line 14034]

+

method formatPageNumber [line 14319]

@@ -9747,7 +9747,7 @@ $num)
-

method formatTOCPageNumber [line 14046]

+

method formatTOCPageNumber [line 14331]

@@ -9820,7 +9820,7 @@ $num)
-

method getAliasNbPages [line 13942]

+

method getAliasNbPages [line 14227]

@@ -9851,7 +9851,7 @@ $num)
-

method getAliasNumPage [line 13970]

+

method getAliasNumPage [line 14255]

@@ -9882,7 +9882,7 @@ $num)
-

method getAnnotOptFromJSProp [line 12840]

+

method getAnnotOptFromJSProp [line 13125]

@@ -9996,7 +9996,7 @@ $getarray = false])
-

method getBarcode [line 15242]

+

method getBarcode [line 15527]

@@ -10120,7 +10120,7 @@ $pagenum = ''])
-

method getBuffer [line 19501]

+

method getBuffer [line 19786]

@@ -10259,7 +10259,7 @@ $valign = 'M'])
-

method getCellHeightRatio [line 14215]

+

method getCellHeightRatio [line 14500]

@@ -10332,7 +10332,7 @@ $char)
-

method getEncPermissionsString [line 10820]

+

method getEncPermissionsString [line 11105]

@@ -10428,7 +10428,7 @@ $size = 0])
-

method getFontBuffer [line 19661]

+

method getFontBuffer [line 19946]

@@ -10524,7 +10524,7 @@ $size = 0])
-

method getFontFamily [line 15787]

+

method getFontFamily [line 16072]

@@ -10555,7 +10555,7 @@ $size = 0])
-

method getFontSize [line 15767]

+

method getFontSize [line 16052]

@@ -10586,7 +10586,7 @@ $size = 0])
-

method getFontSizePt [line 15777]

+

method getFontSizePt [line 16062]

@@ -10645,7 +10645,7 @@ $size = 0])
-

method getFontStyle [line 15797]

+

method getFontStyle [line 16082]

@@ -10676,7 +10676,7 @@ $size = 0])
-

method getFontSubsetting [line 20808]

+

method getFontSubsetting [line 21093]

@@ -10710,7 +10710,7 @@ $size = 0])
-

method getFooterFont [line 10117]

+

method getFooterFont [line 10401]

@@ -10766,7 +10766,7 @@ $size = 0])
-

method getFormDefaultProp [line 13215]

+

method getFormDefaultProp [line 13500]

@@ -10839,7 +10839,7 @@ $v)
-

method getGraphicVars [line 19335]

+

method getGraphicVars [line 19620]

@@ -10870,7 +10870,7 @@ $v)
-

method getGroupPageNo [line 13983]

+

method getGroupPageNo [line 14268]

@@ -10901,7 +10901,7 @@ $v)
-

method getGroupPageNoFormatted [line 13993]

+

method getGroupPageNoFormatted [line 14278]

@@ -10960,7 +10960,7 @@ $v)
-

method getHeaderFont [line 10097]

+

method getHeaderFont [line 10381]

@@ -11016,7 +11016,7 @@ $v)
-

method getHtmlDomArray [line 16085]

+

method getHtmlDomArray [line 16370]

@@ -11055,7 +11055,7 @@ $html)
-

method getHTMLUnitToUnits [line 19046]

+

method getHTMLUnitToUnits [line 19331]

@@ -11121,7 +11121,7 @@ $point)
-

method getHyphenPatternsFromTEX [line 20608]

+

method getHyphenPatternsFromTEX [line 20893]

@@ -11166,7 +11166,7 @@ $file)
-

method getImageBuffer [line 19603]

+

method getImageBuffer [line 19888]

@@ -11371,7 +11371,7 @@ $iminfo = array()])
-

method GetLineWidth [line 11163]

+

method GetLineWidth [line 11448]

@@ -11405,7 +11405,7 @@ $iminfo = array()])
-

method getMargins [line 15730]

+

method getMargins [line 16015]

@@ -11587,7 +11587,7 @@ $lineWidth = ''])
-

method getObjFilename [line 19415]

+

method getObjFilename [line 19700]

@@ -11632,7 +11632,7 @@ $prefix)
-

method getOriginalMargins [line 15753]

+

method getOriginalMargins [line 16038]

@@ -11697,7 +11697,7 @@ $prefix)
-

method getPageBuffer [line 19544]

+

method getPageBuffer [line 19829]

@@ -11784,7 +11784,7 @@ $pagenum = ''])
-

method getPageGroupAlias [line 14005]

+

method getPageGroupAlias [line 14290]

@@ -11863,7 +11863,7 @@ $pagenum = ''])
-

method getPageNumGroupAlias [line 14020]

+

method getPageNumGroupAlias [line 14305]

@@ -11984,7 +11984,7 @@ $pagenum = ''])
-

method getPathPaintOperator [line 20720]

+

method getPathPaintOperator [line 21005]

@@ -12038,7 +12038,7 @@ $mode)
-

method getPDFData [line 10140]

+

method getPDFData [line 10424]

@@ -12153,7 +12153,7 @@ $mode)
-

method getSpaceString [line 16690]

+

method getSpaceString [line 16975]

@@ -12356,7 +12356,7 @@ $getarray = false])
-

method getSVGTransformMatrix [line 21127]

+

method getSVGTransformMatrix [line 21412]

@@ -12401,7 +12401,7 @@ $attribute)
-

method getTagStyleFromCSS [line 16056]

+

method getTagStyleFromCSS [line 16341]

@@ -12455,7 +12455,7 @@ $css)
-

method getTransformationMatrixProduct [line 21231]

+

method getTransformationMatrixProduct [line 21516]

@@ -12506,7 +12506,7 @@ $tb)
-

method getUserPermissionCode [line 10661]

+

method getUserPermissionCode [line 10945]

@@ -12554,7 +12554,7 @@ $mode = 0])
-

method getVectorsAngle [line 21861]

+

method getVectorsAngle [line 22146]

@@ -12707,7 +12707,7 @@ $y2)
-

method Gradient [line 14604]

+

method Gradient [line 14889]

@@ -12798,7 +12798,7 @@ $antialias = false])
-

method hyphenateText [line 20647]

+

method hyphenateText [line 20932]

@@ -12879,7 +12879,7 @@ $charmax = 8])
-

method hyphenateWord [line 20538]

+

method hyphenateWord [line 20823]

@@ -13098,7 +13098,7 @@ $fitonpage = false])
-

method ImageEps [line 14952]

+

method ImageEps [line 15237]

@@ -13305,7 +13305,7 @@ $palign = ''])
-

method ImageSVG [line 20833]

+

method ImageSVG [line 21118]

@@ -13401,7 +13401,7 @@ $fitonpage = false])
-

method IncludeJS [line 12701]

+

method IncludeJS [line 12986]

@@ -13443,7 +13443,7 @@ $script)
-

method intToRoman [line 19125]

+

method intToRoman [line 19410]

@@ -13513,7 +13513,7 @@ $number)
-

method isValidCSSSelectorForTag [line 15897]

+

method isValidCSSSelectorForTag [line 16182]

@@ -13609,7 +13609,7 @@ $resetmargins = false])
-

method Line [line 11333]

+

method Line [line 11618]

@@ -13675,7 +13675,7 @@ $style = array()])
-

method LinearGradient [line 14454]

+

method LinearGradient [line 14739]

@@ -13825,7 +13825,7 @@ $spaces = 0])
-

method ListBox [line 13412]

+

method ListBox [line 13697]

@@ -13963,7 +13963,7 @@ $cell = false])
-

method MirrorH [line 10945]

+

method MirrorH [line 11230]

@@ -14005,7 +14005,7 @@ $x = ''])
-

method MirrorL [line 10981]

+

method MirrorL [line 11266]

@@ -14059,7 +14059,7 @@ $y = ''])
-

method MirrorP [line 10968]

+

method MirrorP [line 11253]

@@ -14107,7 +14107,7 @@ $y = ''])
-

method MirrorV [line 10956]

+

method MirrorV [line 11241]

@@ -14149,7 +14149,7 @@ $y = ''])
-

method movePage [line 19678]

+

method movePage [line 19963]

@@ -14323,7 +14323,7 @@ $maxh = 0])
-

method objclone [line 20325]

+

method objclone [line 20610]

@@ -14396,7 +14396,7 @@ $object)
-

method openHTMLTagHandler [line 17923]

+

method openHTMLTagHandler [line 18208]

@@ -14532,7 +14532,7 @@ $dest = 'I'])
-

method PageNoFormatted [line 14056]

+

method PageNoFormatted [line 14341]

@@ -14563,7 +14563,7 @@ $dest = 'I'])
-

method PieSector [line 14891]

+

method PieSector [line 15176]

@@ -14659,7 +14659,7 @@ $o:)
-

method PieSectorXY [line 14912]

+

method PieSectorXY [line 15197]

@@ -14767,7 +14767,7 @@ $o:)
-

method pixelsToUnits [line 10259]

+

method pixelsToUnits [line 10543]

@@ -14809,7 +14809,7 @@ $px)
-

method Polycurve [line 11443]

+

method Polycurve [line 11728]

@@ -14881,7 +14881,7 @@ $fill_color = array()])
-

method Polygon [line 11649]

+

method Polygon [line 11934]

@@ -14944,7 +14944,7 @@ $closed = true])
-

method PolyLine [line 11630]

+

method PolyLine [line 11915]

@@ -15007,7 +15007,7 @@ $closed)
-

method putHtmlListBullet [line 19190]

+

method putHtmlListBullet [line 19475]

@@ -15058,7 +15058,7 @@ $size = 10])
-

method RadialGradient [line 14472]

+

method RadialGradient [line 14757]

@@ -15136,7 +15136,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])
-

method RadioButton [line 13324]

+

method RadioButton [line 13609]

@@ -15226,7 +15226,7 @@ $js = false])
-

method readDiskCache [line 19455]

+

method readDiskCache [line 19740]

@@ -15274,7 +15274,7 @@ $file)
-

method Rect [line 11361]

+

method Rect [line 11646]

@@ -15352,7 +15352,7 @@ $fill_color = array()])
-

method registrationMark [line 14423]

+

method registrationMark [line 14708]

@@ -15424,7 +15424,7 @@ $colb = array(255,255,255)])
-

method RegularPolygon [line 11747]

+

method RegularPolygon [line 12032]

@@ -15577,7 +15577,7 @@ $txt = ''])
-

method replaceBuffer [line 19483]

+

method replaceBuffer [line 19768]

@@ -15616,7 +15616,7 @@ $data)
-

method revstrpos [line 20349]

+

method revstrpos [line 20634]

@@ -15721,7 +15721,7 @@ $length)
-

method rollbackTransaction [line 20296]

+

method rollbackTransaction [line 20581]

@@ -15763,7 +15763,7 @@ $self = false])
-

method Rotate [line 11037]

+

method Rotate [line 11322]

@@ -15817,7 +15817,7 @@ $y = ''])
-

method RoundedRect [line 11837]

+

method RoundedRect [line 12122]

@@ -15904,7 +15904,7 @@ $fill_color = array()])
-

method RoundedRectXY [line 11856]

+

method RoundedRectXY [line 12141]

@@ -15997,7 +15997,7 @@ $fill_color = array()])
-

method Scale [line 10913]

+

method Scale [line 11198]

@@ -16057,7 +16057,7 @@ $y = ''])
-

method ScaleX [line 10873]

+

method ScaleX [line 11158]

@@ -16111,7 +16111,7 @@ $y = ''])
-

method ScaleXY [line 10899]

+

method ScaleXY [line 11184]

@@ -16165,7 +16165,7 @@ $y = ''])
-

method ScaleY [line 10886]

+

method ScaleY [line 11171]

@@ -16219,7 +16219,7 @@ $y = ''])
-

method segSVGContentHandler [line 22314]

+

method segSVGContentHandler [line 22599]

@@ -16267,7 +16267,7 @@ $data)
-

method selectColumn [line 20412]

+

method selectColumn [line 20697]

@@ -16306,7 +16306,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 20463]

+

method serializeTCPDFtagParameters [line 20748]

@@ -16348,7 +16348,7 @@ $pararray)
-

method setAlpha [line 14172]

+

method setAlpha [line 14457]

@@ -16483,7 +16483,7 @@ $margin = 0])
-

method setBarcode [line 15232]

+

method setBarcode [line 15517]

@@ -16519,7 +16519,7 @@ $bc = ''])
-

method SetBooklet [line 18960]

+

method SetBooklet [line 19245]

@@ -16570,7 +16570,7 @@ $outer = -1])
-

method setBuffer [line 19465]

+

method setBuffer [line 19750]

@@ -16609,7 +16609,7 @@ $data)
-

method setCellHeightRatio [line 14206]

+

method setCellHeightRatio [line 14491]

@@ -16690,7 +16690,7 @@ $pad)
-

method setColumnsArray [line 20399]

+

method setColumnsArray [line 20684]

@@ -16888,7 +16888,7 @@ $font)
-

method setDefaultTableColumns [line 14196]

+

method setDefaultTableColumns [line 14481]

@@ -17128,7 +17128,7 @@ $tint = 100])
-

method setEqualColumns [line 20366]

+

method setEqualColumns [line 20651]

@@ -17179,7 +17179,7 @@ $y = ''])
-

method setExtGState [line 14137]

+

method setExtGState [line 14422]

@@ -17437,7 +17437,7 @@ $subset = 'default'])
-

method setFontBuffer [line 19619]

+

method setFontBuffer [line 19904]

@@ -17524,7 +17524,7 @@ $size)
-

method setFontSubBuffer [line 19641]

+

method setFontSubBuffer [line 19926]

@@ -17575,7 +17575,7 @@ $data)
-

method setFontSubsetting [line 20797]

+

method setFontSubsetting [line 21082]

@@ -17645,7 +17645,7 @@ $enable = true])
-

method setFooterFont [line 10107]

+

method setFooterFont [line 10391]

@@ -17720,7 +17720,7 @@ $fm = 10])
-

method setFormDefaultProp [line 13204]

+

method setFormDefaultProp [line 13489]

@@ -17762,7 +17762,7 @@ $prop = array()])
-

method setGraphicVars [line 19374]

+

method setGraphicVars [line 19659]

@@ -17883,7 +17883,7 @@ $hs = ''])
-

method setHeaderFont [line 10087]

+

method setHeaderFont [line 10371]

@@ -17958,7 +17958,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 19031]

+

method setHtmlLinksStyle [line 19316]

@@ -18003,7 +18003,7 @@ $fontstyle = 'U'])
-

method setHtmlVSpace [line 19000]

+

method setHtmlVSpace [line 19285]

@@ -18042,7 +18042,7 @@ $tagvs)
-

method setImageBuffer [line 19560]

+

method setImageBuffer [line 19845]

@@ -18129,7 +18129,7 @@ $scale)
-

method setImageSubBuffer [line 19583]

+

method setImageSubBuffer [line 19868]

@@ -18180,7 +18180,7 @@ $data)
-

method setJPEGQuality [line 14183]

+

method setJPEGQuality [line 14468]

@@ -18261,7 +18261,7 @@ $keywords)
-

method setLanguageArray [line 10127]

+

method setLanguageArray [line 10411]

@@ -18384,7 +18384,7 @@ $margin)
-

method SetLineStyle [line 11188]

+

method SetLineStyle [line 11473]

@@ -18430,7 +18430,7 @@ $style)
-

method SetLineWidth [line 11147]

+

method SetLineWidth [line 11432]

@@ -18526,7 +18526,7 @@ $page = -1])
-

method setListIndentWidth [line 19010]

+

method setListIndentWidth [line 19295]

@@ -18565,7 +18565,7 @@ $width)
-

method setLIsymbol [line 18921]

+

method setLIsymbol [line 19206]

@@ -18664,7 +18664,7 @@ $keepmargins = false])
-

method setOpenCell [line 19020]

+

method setOpenCell [line 19305]

@@ -18826,7 +18826,7 @@ $points = false])
-

method setPageBuffer [line 19517]

+

method setPageBuffer [line 19802]

@@ -19043,7 +19043,7 @@ $unit)
-

method setPDFVersion [line 14225]

+

method setPDFVersion [line 14510]

@@ -19160,7 +19160,7 @@ $val = true])
-

method SetProtection [line 10705]

+

method SetProtection [line 10989]

@@ -19226,7 +19226,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 20694]

+

method setRasterizeVectorImages [line 20979]

@@ -19352,7 +19352,7 @@ $resetx = true])
-

method setSignature [line 13862]

+

method setSignature [line 14147]

@@ -19424,7 +19424,7 @@ $info = array()])
-

method setSignatureAppearance [line 13895]

+

method setSignatureAppearance [line 14180]

@@ -19571,7 +19571,7 @@ $subject)
-

method setSVGStyles [line 21288]

+

method setSVGStyles [line 21573]

@@ -19824,7 +19824,7 @@ $color)
-

method setTextRenderingMode [line 20475]

+

method setTextRenderingMode [line 20760]

@@ -20007,7 +20007,7 @@ $margin)
-

method setUserRights [line 13829]

+

method setUserRights [line 14114]

@@ -20073,7 +20073,7 @@ $signature = '/Modify'])
-

method setViewerPreferences [line 14238]

+

method setViewerPreferences [line 14523]

@@ -20115,7 +20115,7 @@ $preferences)
-

method setVisibility [line 14082]

+

method setVisibility [line 14367]

@@ -20349,7 +20349,7 @@ $mqr)
-

method Skew [line 11093]

+

method Skew [line 11378]

@@ -20409,7 +20409,7 @@ $y = ''])
-

method SkewX [line 11066]

+

method SkewX [line 11351]

@@ -20463,7 +20463,7 @@ $y = ''])
-

method SkewY [line 11079]

+

method SkewY [line 11364]

@@ -20517,7 +20517,7 @@ $y = ''])
-

method StarPolygon [line 11795]

+

method StarPolygon [line 12080]

@@ -20695,7 +20695,7 @@ $tocpage = false])
-

method startPageGroup [line 13915]

+

method startPageGroup [line 14200]

@@ -20734,7 +20734,7 @@ $page = ''])
-

method startSVGElementHandler [line 21884]

+

method startSVGElementHandler [line 22169]

@@ -20788,7 +20788,7 @@ $attribs)
-

method startTransaction [line 20265]

+

method startTransaction [line 20550]

@@ -20816,7 +20816,7 @@ $attribs)
-

method StartTransform [line 10841]

+

method StartTransform [line 11126]

@@ -20847,7 +20847,7 @@ $attribs)
-

method StopTransform [line 10856]

+

method StopTransform [line 11141]

@@ -20878,7 +20878,7 @@ $attribs)
-

method SVGPath [line 21543]

+

method SVGPath [line 21828]

@@ -20929,7 +20929,7 @@ $style = ''])
-

method SVGTransform [line 21269]

+

method SVGTransform [line 21554]

@@ -20968,7 +20968,7 @@ $tm)
-

method swapMargins [line 18976]

+

method swapMargins [line 19261]

@@ -21178,7 +21178,7 @@ $rtloff = false])
-

method TextField [line 13233]

+

method TextField [line 13518]

@@ -21262,7 +21262,7 @@ $js = false])
-

method Transform [line 11123]

+

method Transform [line 11408]

@@ -21304,7 +21304,7 @@ $tm)
-

method Translate [line 11016]

+

method Translate [line 11301]

@@ -21352,7 +21352,7 @@ $t_y)
-

method TranslateX [line 10993]

+

method TranslateX [line 11278]

@@ -21394,7 +21394,7 @@ $t_x)
-

method TranslateY [line 11004]

+

method TranslateY [line 11289]

@@ -21436,7 +21436,7 @@ $t_y)
-

method unhtmlentities [line 10270]

+

method unhtmlentities [line 10554]

@@ -21667,7 +21667,7 @@ $end = ''])
-

method UTF8ArrToLatin1 [line 9995]

+

method UTF8ArrToLatin1 [line 10279]

@@ -21709,7 +21709,7 @@ $unicode)
-

method utf8Bidi [line 12017]

+

method utf8Bidi [line 12302]

@@ -21766,7 +21766,7 @@ $forcertl = false])
-

method utf8StrArrRev [line 12003]

+

method utf8StrArrRev [line 12288]

@@ -21826,7 +21826,7 @@ $forcertl = false])
-

method UTF8StringToArray [line 9848]

+

method UTF8StringToArray [line 10132]

@@ -21892,7 +21892,7 @@ $str)
-

method utf8StrRev [line 11988]

+

method utf8StrRev [line 12273]

@@ -21946,7 +21946,7 @@ $forcertl = false])
-

method UTF8ToLatin1 [line 9965]

+

method UTF8ToLatin1 [line 10249]

@@ -21988,7 +21988,7 @@ $str)
-

method UTF8ToUTF16BE [line 9949]

+

method UTF8ToUTF16BE [line 10233]

@@ -22135,7 +22135,7 @@ $maxh = 0])
-

method write1DBarcode [line 15261]

+

method write1DBarcode [line 15546]

@@ -22225,7 +22225,7 @@ $align = ''])
-

method write2DBarcode [line 15505]

+

method write2DBarcode [line 15790]

@@ -22315,7 +22315,7 @@ $distort = false])
-

method writeBarcode [line 15454]

+

method writeBarcode [line 15739]

@@ -22405,7 +22405,7 @@ $code)
-

method writeDiskCache [line 19427]

+

method writeDiskCache [line 19712]

@@ -22462,7 +22462,7 @@ $file)
-

method writeHTML [line 16734]

+

method writeHTML [line 17019]

@@ -22528,7 +22528,7 @@ $align = ''])
-

method writeHTMLCell [line 16718]

+

method writeHTMLCell [line 17003]

@@ -22630,7 +22630,7 @@ $autopadding = true])
-

method _addfield [line 12805]

+

method _addfield [line 13090]

@@ -22708,7 +22708,7 @@ $prop)
-

method _AES [line 10493]

+

method _AES [line 10777]

@@ -22759,7 +22759,7 @@ $text)
-

method _beginpage [line 9514]

+

method _beginpage [line 9798]

@@ -22804,7 +22804,7 @@ $format = ''])
-

method _dataannobjstring [line 9691]

+

method _dataannobjstring [line 9975]

@@ -22843,7 +22843,7 @@ $s)
-

method _datastring [line 9680]

+

method _datastring [line 9964]

@@ -22882,7 +22882,7 @@ $s)
-

method _datestring [line 9702]

+

method _datestring [line 9986]

@@ -22913,7 +22913,7 @@ $s)
-

method _destroy [line 7202]

+

method _destroy [line 7203]

@@ -22958,7 +22958,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 7230]

+

method _dochecks [line 7231]

@@ -22983,7 +22983,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 9607]

+

method _dolinethrough [line 9891]

@@ -23031,7 +23031,7 @@ $txt)
-

method _dolinethroughw [line 9620]

+

method _dolinethroughw [line 9904]

@@ -23088,7 +23088,7 @@ $txt)
-

method _dooverline [line 9633]

+

method _dooverline [line 9917]

@@ -23139,7 +23139,7 @@ $txt)
-

method _dooverlinew [line 9646]

+

method _dooverlinew [line 9930]

@@ -23190,7 +23190,7 @@ $w)
-

method _dounderline [line 9582]

+

method _dounderline [line 9866]

@@ -23238,7 +23238,7 @@ $txt)
-

method _dounderlinew [line 9595]

+

method _dounderlinew [line 9879]

@@ -23289,7 +23289,7 @@ $w)
-

method _encrypt_data [line 10303]

+

method _encrypt_data [line 10587]

@@ -23337,7 +23337,7 @@ $s)
-

method _enddoc [line 9382]

+

method _enddoc [line 9666]

@@ -23362,7 +23362,7 @@ $s)
-

method _endpage [line 9558]

+

method _endpage [line 9842]

@@ -23387,7 +23387,7 @@ $s)
-

method _escape [line 9669]

+

method _escape [line 9953]

@@ -23426,7 +23426,7 @@ $s)
-

method _escapetext [line 9741]

+

method _escapetext [line 10025]

@@ -23465,7 +23465,7 @@ $s)
-

method _freadint [line 9658]

+

method _freadint [line 9942]

@@ -23504,7 +23504,7 @@ $f)
-

method _generateencryptionkey [line 10580]

+

method _generateencryptionkey [line 10864]

@@ -23558,7 +23558,7 @@ $protection)
-

method _getannotsrefs [line 7479]

+

method _getannotsrefs [line 7480]

@@ -23600,7 +23600,7 @@ $n)
-

method _getBYTE [line 8203]

+

method _getBYTE [line 8204]

@@ -23663,7 +23663,7 @@ $offset)
-

method _getfontpath [line 7246]

+

method _getfontpath [line 7247]

@@ -23688,7 +23688,7 @@ $offset)
-

method _getrawstream [line 9761]

+

method _getrawstream [line 10045]

@@ -23736,7 +23736,7 @@ $n = 0])
-

method _getSHORT [line 8188]

+

method _getSHORT [line 8189]

@@ -23799,7 +23799,7 @@ $offset)
-

method _getstream [line 9776]

+

method _getstream [line 10060]

@@ -23844,7 +23844,7 @@ $n = 0])
-

method _getTrueTypeFontSubset [line 8218]

+

method _getTrueTypeFontSubset [line 8219]

@@ -23895,7 +23895,7 @@ $subsetchars)
-

method _getTTFtableChecksum [line 8549]

+

method _getTTFtableChecksum [line 8550]

@@ -23946,7 +23946,7 @@ $length)
-

method _getULONG [line 8158]

+

method _getULONG [line 8159]

@@ -24009,7 +24009,7 @@ $offset)
-

method _getUSHORT [line 8173]

+

method _getUSHORT [line 8174]

@@ -24072,7 +24072,7 @@ $offset)
-

method _JScolor [line 12781]

+

method _JScolor [line 13066]

@@ -24114,7 +24114,7 @@ $color)
-

method _md5_16 [line 10511]

+

method _md5_16 [line 10795]

@@ -24159,7 +24159,7 @@ $str)
-

method _newobj [line 9568]

+

method _newobj [line 9852]

@@ -24187,7 +24187,7 @@ $str)
-

method _objectkey [line 10284]

+

method _objectkey [line 10568]

@@ -24229,7 +24229,7 @@ $n)
-

method _out [line 9796]

+

method _out [line 10080]

@@ -24265,7 +24265,7 @@ $s)
-

method _outCurve [line 11288]

+

method _outCurve [line 11573]

@@ -24334,7 +24334,7 @@ $y3)
-

method _outCurveV [line 11302]

+

method _outCurveV [line 11587]

@@ -24391,7 +24391,7 @@ $y3)
-

method _outCurveY [line 11318]

+

method _outCurveY [line 11603]

@@ -24460,7 +24460,7 @@ $y2)
-

method _outellipticalarc [line 11514]

+

method _outellipticalarc [line 11799]

@@ -24568,7 +24568,7 @@ $angf:)
-

method _outLine [line 11258]

+

method _outLine [line 11543]

@@ -24613,7 +24613,7 @@ $y)
-

method _outPoint [line 11246]

+

method _outPoint [line 11531]

@@ -24658,7 +24658,7 @@ $y)
-

method _outRect [line 11272]

+

method _outRect [line 11557]

@@ -24721,7 +24721,7 @@ $op)
-

method _Ovalue [line 10524]

+

method _Ovalue [line 10808]

@@ -24850,7 +24850,7 @@ $file)
-

method _putannotsobjs [line 7511]

+

method _putannotsobjs [line 7512]

@@ -24881,7 +24881,7 @@ $file)
-

method _putannotsrefs [line 7467]

+

method _putannotsrefs [line 7468]

@@ -24926,7 +24926,7 @@ $n)
-

method _putAPXObject [line 8123]

+

method _putAPXObject [line 8124]

@@ -24980,7 +24980,7 @@ $stream = ''])
-

method _putbookmarks [line 12619]

+

method _putbookmarks [line 12904]

@@ -25011,7 +25011,7 @@ $stream = ''])
-

method _putcatalog [line 9213]

+

method _putcatalog [line 9497]

@@ -25039,7 +25039,7 @@ $stream = ''])
-

method _putcidfont0 [line 8936]

+

method _putcidfont0 [line 9220]

@@ -25115,7 +25115,7 @@ $font)
-

method _putencryption [line 10327]

+

method _putencryption [line 10611]

@@ -25146,7 +25146,7 @@ $font)
-

method _putextgstates [line 14147]

+

method _putextgstates [line 14432]

@@ -25185,7 +25185,7 @@ $gs)
-

method _putfonts [line 8670]

+

method _putfonts [line 8671]

@@ -25213,7 +25213,7 @@ $gs)
-

method _putfontwidths [line 8571]

+

method _putfontwidths [line 8572]

@@ -25264,7 +25264,7 @@ $cidoffset = 0])
-

method _putheader [line 9374]

+

method _putheader [line 9658]

@@ -25289,7 +25289,7 @@ $cidoffset = 0])
-

method _putimages [line 9007]

+

method _putimages [line 9291]

@@ -25314,7 +25314,7 @@ $cidoffset = 0])
-

method _putinfo [line 9166]

+

method _putinfo [line 9450]

@@ -25342,7 +25342,7 @@ $cidoffset = 0])
-

method _putjavascript [line 12726]

+

method _putjavascript [line 13011]

@@ -25373,7 +25373,7 @@ $cidoffset = 0])
-

method _putocg [line 14065]

+

method _putocg [line 14350]

@@ -25401,7 +25401,7 @@ $cidoffset = 0])
-

method _putpages [line 7257]

+

method _putpages [line 7258]

@@ -25426,7 +25426,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 9081]

+

method _putresourcedict [line 9365]

@@ -25451,7 +25451,7 @@ $cidoffset = 0])
-

method _putresources [line 9142]

+

method _putresources [line 9426]

@@ -25476,7 +25476,7 @@ $cidoffset = 0])
-

method _putshaders [line 14702]

+

method _putshaders [line 14987]

@@ -25507,7 +25507,7 @@ $cidoffset = 0])
-

method _putsignature [line 13753]

+

method _putsignature [line 14038]

diff --git a/qrcode.php b/qrcode.php index 2fdeee4..a6bba16 100644 --- a/qrcode.php +++ b/qrcode.php @@ -254,7 +254,7 @@ if (!defined('QRCODEDEFS')) { if (!class_exists('QRcode', false)) { - // for compaibility with PHP4 + // for compatibility with PHP4 if (!function_exists('str_split')) { /** * Convert a string to an array (needed for PHP4 compatibility) @@ -1571,7 +1571,7 @@ if (!class_exists('QRcode', false)) { $words = (int)($inputitem['size'] / 2); $inputitem['bstream'] = array(); $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02); - $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']); //DEBUG + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']); for ($i=0; $i < $words; ++$i) { $val = (int)$this->lookAnTable(ord($inputitem['data'][$i*2 ])) * 45; $val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1])); diff --git a/tcpdf.php b/tcpdf.php index f9cbdb5..da71ae7 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 5.5.001 + * @version 5.5.002 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -7064,9 +7064,10 @@ if (!class_exists('TCPDF', false)) { } unlink($tempdoc); // read signature - $signature = file_get_contents($tempsign, false, null, $pdfdoc_length); + $signature = file_get_contents($tempsign); unlink($tempsign); // extract signature + $signature = substr($signature, $pdfdoc_length); $signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13)); $tmparr = explode("\n\n", $signature); $signature = $tmparr[1]; @@ -8844,11 +8845,294 @@ if (!class_exists('TCPDF', false)) { $out .= ' /BaseFont /'.$fontname; $out .= ' /Name /F'.$font['i']; $out .= ' /Encoding /'.$font['enc']; - $out .= ' /ToUnicode /Identity-H'; - $out .= ' /DescendantFonts ['.($this->n + 1).' 0 R]'; + $out .= ' /ToUnicode '.($this->n + 1).' 0 R'; + $out .= ' /DescendantFonts ['.($this->n + 2).' 0 R]'; $out .= ' >>'; $out .= "\n".'endobj'; - $this->_out($out); + $this->_out($out); + // ToUnicode map for Identity-H + $stream = "/CIDInit /ProcSet findresource begin\n"; + $stream .= "12 dict begin\n"; + $stream .= "begincmap\n"; + $stream .= "/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def\n"; + $stream .= "/CMapName /Adobe-Identity-UCS def\n"; + $stream .= "/CMapType 2 def\n"; + $stream .= "/WMode 0 def\n"; + $stream .= "1 begincodespacerange\n"; + $stream .= "<0000> \n"; + $stream .= "endcodespacerange\n"; + $stream .= "100 beginbfrange\n"; + $stream .= "<0000> <00ff> <0000>\n"; + $stream .= "<0100> <01ff> <0100>\n"; + $stream .= "<0200> <02ff> <0200>\n"; + $stream .= "<0300> <03ff> <0300>\n"; + $stream .= "<0400> <04ff> <0400>\n"; + $stream .= "<0500> <05ff> <0500>\n"; + $stream .= "<0600> <06ff> <0600>\n"; + $stream .= "<0700> <07ff> <0700>\n"; + $stream .= "<0800> <08ff> <0800>\n"; + $stream .= "<0900> <09ff> <0900>\n"; + $stream .= "<0a00> <0aff> <0a00>\n"; + $stream .= "<0b00> <0bff> <0b00>\n"; + $stream .= "<0c00> <0cff> <0c00>\n"; + $stream .= "<0d00> <0dff> <0d00>\n"; + $stream .= "<0e00> <0eff> <0e00>\n"; + $stream .= "<0f00> <0fff> <0f00>\n"; + $stream .= "<1000> <10ff> <1000>\n"; + $stream .= "<1100> <11ff> <1100>\n"; + $stream .= "<1200> <12ff> <1200>\n"; + $stream .= "<1300> <13ff> <1300>\n"; + $stream .= "<1400> <14ff> <1400>\n"; + $stream .= "<1500> <15ff> <1500>\n"; + $stream .= "<1600> <16ff> <1600>\n"; + $stream .= "<1700> <17ff> <1700>\n"; + $stream .= "<1800> <18ff> <1800>\n"; + $stream .= "<1900> <19ff> <1900>\n"; + $stream .= "<1a00> <1aff> <1a00>\n"; + $stream .= "<1b00> <1bff> <1b00>\n"; + $stream .= "<1c00> <1cff> <1c00>\n"; + $stream .= "<1d00> <1dff> <1d00>\n"; + $stream .= "<1e00> <1eff> <1e00>\n"; + $stream .= "<1f00> <1fff> <1f00>\n"; + $stream .= "<2000> <20ff> <2000>\n"; + $stream .= "<2100> <21ff> <2100>\n"; + $stream .= "<2200> <22ff> <2200>\n"; + $stream .= "<2300> <23ff> <2300>\n"; + $stream .= "<2400> <24ff> <2400>\n"; + $stream .= "<2500> <25ff> <2500>\n"; + $stream .= "<2600> <26ff> <2600>\n"; + $stream .= "<2700> <27ff> <2700>\n"; + $stream .= "<2800> <28ff> <2800>\n"; + $stream .= "<2900> <29ff> <2900>\n"; + $stream .= "<2a00> <2aff> <2a00>\n"; + $stream .= "<2b00> <2bff> <2b00>\n"; + $stream .= "<2c00> <2cff> <2c00>\n"; + $stream .= "<2d00> <2dff> <2d00>\n"; + $stream .= "<2e00> <2eff> <2e00>\n"; + $stream .= "<2f00> <2fff> <2f00>\n"; + $stream .= "<3000> <30ff> <3000>\n"; + $stream .= "<3100> <31ff> <3100>\n"; + $stream .= "<3200> <32ff> <3200>\n"; + $stream .= "<3300> <33ff> <3300>\n"; + $stream .= "<3400> <34ff> <3400>\n"; + $stream .= "<3500> <35ff> <3500>\n"; + $stream .= "<3600> <36ff> <3600>\n"; + $stream .= "<3700> <37ff> <3700>\n"; + $stream .= "<3800> <38ff> <3800>\n"; + $stream .= "<3900> <39ff> <3900>\n"; + $stream .= "<3a00> <3aff> <3a00>\n"; + $stream .= "<3b00> <3bff> <3b00>\n"; + $stream .= "<3c00> <3cff> <3c00>\n"; + $stream .= "<3d00> <3dff> <3d00>\n"; + $stream .= "<3e00> <3eff> <3e00>\n"; + $stream .= "<3f00> <3fff> <3f00>\n"; + $stream .= "<4000> <40ff> <4000>\n"; + $stream .= "<4100> <41ff> <4100>\n"; + $stream .= "<4200> <42ff> <4200>\n"; + $stream .= "<4300> <43ff> <4300>\n"; + $stream .= "<4400> <44ff> <4400>\n"; + $stream .= "<4500> <45ff> <4500>\n"; + $stream .= "<4600> <46ff> <4600>\n"; + $stream .= "<4700> <47ff> <4700>\n"; + $stream .= "<4800> <48ff> <4800>\n"; + $stream .= "<4900> <49ff> <4900>\n"; + $stream .= "<4a00> <4aff> <4a00>\n"; + $stream .= "<4b00> <4bff> <4b00>\n"; + $stream .= "<4c00> <4cff> <4c00>\n"; + $stream .= "<4d00> <4dff> <4d00>\n"; + $stream .= "<4e00> <4eff> <4e00>\n"; + $stream .= "<4f00> <4fff> <4f00>\n"; + $stream .= "<5000> <50ff> <5000>\n"; + $stream .= "<5100> <51ff> <5100>\n"; + $stream .= "<5200> <52ff> <5200>\n"; + $stream .= "<5300> <53ff> <5300>\n"; + $stream .= "<5400> <54ff> <5400>\n"; + $stream .= "<5500> <55ff> <5500>\n"; + $stream .= "<5600> <56ff> <5600>\n"; + $stream .= "<5700> <57ff> <5700>\n"; + $stream .= "<5800> <58ff> <5800>\n"; + $stream .= "<5900> <59ff> <5900>\n"; + $stream .= "<5a00> <5aff> <5a00>\n"; + $stream .= "<5b00> <5bff> <5b00>\n"; + $stream .= "<5c00> <5cff> <5c00>\n"; + $stream .= "<5d00> <5dff> <5d00>\n"; + $stream .= "<5e00> <5eff> <5e00>\n"; + $stream .= "<5f00> <5fff> <5f00>\n"; + $stream .= "<6000> <60ff> <6000>\n"; + $stream .= "<6100> <61ff> <6100>\n"; + $stream .= "<6200> <62ff> <6200>\n"; + $stream .= "<6300> <63ff> <6300>\n"; + $stream .= "endbfrange\n"; + $stream .= "100 beginbfrange\n"; + $stream .= "<6400> <64ff> <6400>\n"; + $stream .= "<6500> <65ff> <6500>\n"; + $stream .= "<6600> <66ff> <6600>\n"; + $stream .= "<6700> <67ff> <6700>\n"; + $stream .= "<6800> <68ff> <6800>\n"; + $stream .= "<6900> <69ff> <6900>\n"; + $stream .= "<6a00> <6aff> <6a00>\n"; + $stream .= "<6b00> <6bff> <6b00>\n"; + $stream .= "<6c00> <6cff> <6c00>\n"; + $stream .= "<6d00> <6dff> <6d00>\n"; + $stream .= "<6e00> <6eff> <6e00>\n"; + $stream .= "<6f00> <6fff> <6f00>\n"; + $stream .= "<7000> <70ff> <7000>\n"; + $stream .= "<7100> <71ff> <7100>\n"; + $stream .= "<7200> <72ff> <7200>\n"; + $stream .= "<7300> <73ff> <7300>\n"; + $stream .= "<7400> <74ff> <7400>\n"; + $stream .= "<7500> <75ff> <7500>\n"; + $stream .= "<7600> <76ff> <7600>\n"; + $stream .= "<7700> <77ff> <7700>\n"; + $stream .= "<7800> <78ff> <7800>\n"; + $stream .= "<7900> <79ff> <7900>\n"; + $stream .= "<7a00> <7aff> <7a00>\n"; + $stream .= "<7b00> <7bff> <7b00>\n"; + $stream .= "<7c00> <7cff> <7c00>\n"; + $stream .= "<7d00> <7dff> <7d00>\n"; + $stream .= "<7e00> <7eff> <7e00>\n"; + $stream .= "<7f00> <7fff> <7f00>\n"; + $stream .= "<8000> <80ff> <8000>\n"; + $stream .= "<8100> <81ff> <8100>\n"; + $stream .= "<8200> <82ff> <8200>\n"; + $stream .= "<8300> <83ff> <8300>\n"; + $stream .= "<8400> <84ff> <8400>\n"; + $stream .= "<8500> <85ff> <8500>\n"; + $stream .= "<8600> <86ff> <8600>\n"; + $stream .= "<8700> <87ff> <8700>\n"; + $stream .= "<8800> <88ff> <8800>\n"; + $stream .= "<8900> <89ff> <8900>\n"; + $stream .= "<8a00> <8aff> <8a00>\n"; + $stream .= "<8b00> <8bff> <8b00>\n"; + $stream .= "<8c00> <8cff> <8c00>\n"; + $stream .= "<8d00> <8dff> <8d00>\n"; + $stream .= "<8e00> <8eff> <8e00>\n"; + $stream .= "<8f00> <8fff> <8f00>\n"; + $stream .= "<9000> <90ff> <9000>\n"; + $stream .= "<9100> <91ff> <9100>\n"; + $stream .= "<9200> <92ff> <9200>\n"; + $stream .= "<9300> <93ff> <9300>\n"; + $stream .= "<9400> <94ff> <9400>\n"; + $stream .= "<9500> <95ff> <9500>\n"; + $stream .= "<9600> <96ff> <9600>\n"; + $stream .= "<9700> <97ff> <9700>\n"; + $stream .= "<9800> <98ff> <9800>\n"; + $stream .= "<9900> <99ff> <9900>\n"; + $stream .= "<9a00> <9aff> <9a00>\n"; + $stream .= "<9b00> <9bff> <9b00>\n"; + $stream .= "<9c00> <9cff> <9c00>\n"; + $stream .= "<9d00> <9dff> <9d00>\n"; + $stream .= "<9e00> <9eff> <9e00>\n"; + $stream .= "<9f00> <9fff> <9f00>\n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= "endbfrange\n"; + $stream .= "56 beginbfrange\n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= " \n"; + $stream .= "endbfrange\n"; + $stream .= "endcmap\n"; + $stream .= "CMapName currentdict /CMap defineresource pop\n"; + $stream .= "end\n"; + $stream .= "end"; + // ToUnicode Object + $this->_newobj(); + $stream = ($this->compress) ? gzcompress($stream) : $stream; + $filter = ($this->compress) ? '/Filter /FlateDecode ' : ''; + $stream = $this->_getrawstream($stream); + $this->_out('<<'.$filter.'/Length '.strlen($stream).'>> stream'."\n".$stream."\n".'endstream'."\n".'endobj'); // CIDFontType2 // A CIDFont whose glyph descriptions are based on TrueType font technology $this->_newobj(); @@ -10780,14 +11064,15 @@ if (!class_exists('TCPDF', false)) { * @author Nicola Asuni */ protected function convertHexStringToString($bs) { - if ((strlen($bs) % 2) != 0) { + $string = ''; // string to be returned + $bslenght = strlen($bs); + if (($bslenght % 2) != 0) { // padding $bs .= '0'; + ++$bslenght; } - $bytes = str_split($bs, 2); - $string = ''; - foreach ($bytes as $byte) { - $string .= chr(hexdec($byte)); + for ($i = 0; $i < $bslenght; $i += 2) { + $string .= chr(hexdec($bs{$i}.$bs{($i + 1)})); } return $string; }
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 7117e25..2308d81 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25538,7 +25538,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 9063]

+

method _putspotcolors [line 9347]

diff --git a/doc/index.html b/doc/index.html index 7117e25..2308d81 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index dff00d8..248ce9c 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 23 Jun 2010 10:00:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:59 +0200 by phpDocumentor 1.4.3
@@ -25566,7 +25566,7 @@ $cidoffset = 0])
-

method _putstream [line 9787]

+

method _putstream [line 10071]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 20bb326..dc86143 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2058,7 +2058,7 @@ top
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:53 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 761c59b..b609ced 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2026,7 +2026,7 @@ top
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25611,7 +25611,7 @@ $n = 0])
-

method _puttruetypeunicode [line 8830]

+

method _puttruetypeunicode [line 8831]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 1cf73e3..23c732a 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.



- Documentation generated on Wed, 23 Jun 2010 10:00:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:59 +0200 by phpDocumentor 1.4.3
@@ -25656,7 +25656,7 @@ $font)
-

method _putviewerpreferences [line 9303]

+

method _putviewerpreferences [line 9587]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 47288b4..96fdf2a 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -113,7 +113,7 @@ unicode data

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index fa3aa5b..493c7fd 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Wed, 23 Jun 2010 10:00:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25690,7 +25690,7 @@ $font)
-

method _RC4 [line 10447]

+

method _RC4 [line 10731]

diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 1fe7109..4baa5e9 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index c978c97..8b6a242 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25786,7 +25786,7 @@ $image)
-

method _textannobjstring [line 9727]

+

method _textannobjstring [line 10011]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 3f37947..74a4d56 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.



- Documentation generated on Wed, 23 Jun 2010 10:00:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:59 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 338d592..b7cede9 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25825,7 +25825,7 @@ $s)
-

method _textstring [line 9713]

+

method _textstring [line 9997]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index ffbfcb1..622e27e 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 10500f7..ce4f667 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25951,7 +25951,7 @@ $file)
-

method _Uvalue [line 10553]

+

method _Uvalue [line 10837]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index b1bbec6..a81e629 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Wed, 23 Jun 2010 10:00:26 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:54 +0200 by phpDocumentor 1.4.3
@@ -25988,7 +25988,7 @@ $file)
- Documentation generated on Wed, 23 Jun 2010 10:00:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:55 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.5.001version:  5.5.002
copyright:  2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- PDF_PRODUCER = 'TCPDF 5.5.001 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.5.002 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Wed, 23 Jun 2010 10:00:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 24 Jun 2010 10:52:55 +0200 by phpDocumentor 1.4.3