From cc627080c0d83b6ed0146bacce7791a608b61365 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 20 Aug 2010 14:33:54 +0200 Subject: [PATCH] 5.8.009 --- CHANGELOG.TXT | 4 + 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 | 511 ++++++++++-------- 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 | 6 +- doc/elementindex_com-tecnick-tcpdf.html | 6 +- doc/errors.html | 6 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 142 ++--- 22 files changed, 381 insertions(+), 332 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 236bbb9..64c42be 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.8.009 (2010-08-20) + - Internal object numbering was improved. + - Some errors in object encryption were fixed. + 5.8.008 (2010-08-19) - Method write1DBarcode() was changed, check the example n. 27. - Method Footer() was changed to account for barcode changes. diff --git a/README.TXT b/README.TXT index bb6501a..1550666 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.8.008 -Release date: 2010-08-19 +Version: 5.8.009 +Release date: 2010-08-20 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 34c3b45..858c4bb 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index b075cc1..a9e3068 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:42 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index c87a936..8fe5dd8 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:42 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 8996768..c6fd77c 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

@@ -659,6 +659,7 @@ Source Location: /tcpdf.php

  • _getannotsrefs
  • _getBYTE
  • _getfontpath
    • +
  • _getobj
  • _getrawstream
  • _getSHORT
  • _getstream
    • @@ -740,7 +741,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.8.008 + version:  5.8.009 link:  http://www.tcpdf.org @@ -6887,7 +6888,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 4868]

    +

    method AcceptPageBreak [line 4867]

    @@ -6918,7 +6919,7 @@ $diskcache = false])
    -

    method addExtGState [line 14726]

    +

    method addExtGState [line 14722]

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

    method addHtmlLink [line 10769]

    +

    method addHtmlLink [line 10764]

    @@ -7221,7 +7222,7 @@ $firstorlast = false])
    -

    method addJavascriptObject [line 13338]

    +

    method addJavascriptObject [line 13333]

    @@ -7546,7 +7547,7 @@ $keepmargins = false])
    -

    method AliasNbPages [line 14540]

    +

    method AliasNbPages [line 14536]

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

    method AliasNumPage [line 14567]

    +

    method AliasNumPage [line 14563]

    @@ -7705,7 +7706,7 @@ $spaces = 0])
    -

    method Arrow [line 12542]

    +

    method Arrow [line 12537]

    @@ -7783,7 +7784,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 10664]

    +

    method arrUTF8ToUTF16BE [line 10659]

    @@ -7858,7 +7859,7 @@ $setbom = true])
    -

    method Bookmark [line 13210]

    +

    method Bookmark [line 13205]

    @@ -7918,7 +7919,7 @@ $page = ''])
    -

    method Button [line 14212]

    +

    method Button [line 14206]

    @@ -8014,7 +8015,7 @@ $js = false])
    -

    method Cell [line 4975]

    +

    method Cell [line 4974]

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

    method CheckBox [line 14144]

    +

    method CheckBox [line 14138]

    @@ -8212,7 +8213,7 @@ $js = false])
    -

    method checkPageBreak [line 4895]

    +

    method checkPageBreak [line 4894]

    @@ -8266,7 +8267,7 @@ $addpage = true])
    -

    method Circle [line 12230]

    +

    method Circle [line 12225]

    @@ -8365,7 +8366,7 @@ $angend:)
    -

    method Clip [line 15187]

    +

    method Clip [line 15183]

    @@ -8516,7 +8517,7 @@ $dom)
    -

    method colorRegistrationBar [line 14862]

    +

    method colorRegistrationBar [line 14858]

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

    method ComboBox [line 14087]

    +

    method ComboBox [line 14081]

    @@ -8712,7 +8713,7 @@ $js = false])
    -

    method convertHexStringToString [line 11393]

    +

    method convertHexStringToString [line 11388]

    @@ -8754,7 +8755,7 @@ $bs)
    -

    method convertHTMLColorToDec [line 10802]

    +

    method convertHTMLColorToDec [line 10797]

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

    method convertStringToHexString [line 11415]

    +

    method convertStringToHexString [line 11410]

    @@ -8880,7 +8881,7 @@ $tm)
    -

    method CoonsPatchMesh [line 15102]

    +

    method CoonsPatchMesh [line 15098]

    @@ -9030,7 +9031,7 @@ $page = 0])
    -

    method cropMark [line 14960]

    +

    method cropMark [line 14956]

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

    method Curve [line 12035]

    +

    method Curve [line 12030]

    @@ -9291,7 +9292,7 @@ $xmax)
    -

    method Ellipse [line 12099]

    +

    method Ellipse [line 12094]

    @@ -9613,7 +9614,7 @@ $msg)
    -

    method extractCSSproperties [line 16400]

    +

    method extractCSSproperties [line 16396]

    @@ -9658,7 +9659,7 @@ $cssdata)
    -

    method fitBlock [line 6535]

    +

    method fitBlock [line 6534]

    @@ -9770,7 +9771,7 @@ $y)
    -

    method formatPageNumber [line 14644]

    +

    method formatPageNumber [line 14640]

    @@ -9809,7 +9810,7 @@ $num)
    -

    method formatTOCPageNumber [line 14656]

    +

    method formatTOCPageNumber [line 14652]

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

    method GetAbsX [line 7267]

    +

    method GetAbsX [line 7266]

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

    method getAliasNbPages [line 14552]

    +

    method getAliasNbPages [line 14548]

    @@ -9913,7 +9914,7 @@ $num)
    -

    method getAliasNumPage [line 14580]

    +

    method getAliasNumPage [line 14576]

    @@ -9944,7 +9945,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 13464]

    +

    method getAnnotOptFromJSProp [line 13458]

    @@ -10058,7 +10059,7 @@ $getarray = false])
    -

    method getBarcode [line 15824]

    +

    method getBarcode [line 15820]

    @@ -10086,7 +10087,7 @@ $getarray = false])
    -

    method getBorderMode [line 5846]

    +

    method getBorderMode [line 5845]

    @@ -10244,7 +10245,7 @@ $pagenum = ''])
    -

    method getCellBorder [line 5373]

    +

    method getCellBorder [line 5372]

    @@ -10319,7 +10320,7 @@ $mode)
    -

    method getCellCode [line 5006]

    +

    method getCellCode [line 5005]

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

    method getCellHeightRatio [line 14822]

    +

    method getCellHeightRatio [line 14818]

    @@ -10660,7 +10661,7 @@ $width)
    -

    method getEncPermissionsString [line 11432]

    +

    method getEncPermissionsString [line 11427]

    @@ -10858,7 +10859,7 @@ $size = 0])
    -

    method getFontFamily [line 16378]

    +

    method getFontFamily [line 16374]

    @@ -10934,7 +10935,7 @@ $fontfamily)
    -

    method getFontSize [line 16358]

    +

    method getFontSize [line 16354]

    @@ -10965,7 +10966,7 @@ $fontfamily)
    -

    method getFontSizePt [line 16368]

    +

    method getFontSizePt [line 16364]

    @@ -11024,7 +11025,7 @@ $fontfamily)
    -

    method getFontStyle [line 16388]

    +

    method getFontStyle [line 16384]

    @@ -11089,7 +11090,7 @@ $fontfamily)
    -

    method getFooterFont [line 10727]

    +

    method getFooterFont [line 10722]

    @@ -11145,7 +11146,7 @@ $fontfamily)
    -

    method getFormDefaultProp [line 13839]

    +

    method getFormDefaultProp [line 13833]

    @@ -11179,7 +11180,7 @@ $fontfamily)
    -

    method getGDgamma [line 7207]

    +

    method getGDgamma [line 7206]

    @@ -11249,7 +11250,7 @@ $v)
    -

    method getGroupPageNo [line 14593]

    +

    method getGroupPageNo [line 14589]

    @@ -11280,7 +11281,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 14603]

    +

    method getGroupPageNoFormatted [line 14599]

    @@ -11339,7 +11340,7 @@ $v)
    -

    method getHeaderFont [line 10707]

    +

    method getHeaderFont [line 10702]

    @@ -11587,7 +11588,7 @@ $image)
    -

    method getImageFileType [line 6505]

    +

    method getImageFileType [line 6504]

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

    method GetLineWidth [line 11775]

    +

    method GetLineWidth [line 11770]

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

    method getMargins [line 16321]

    +

    method getMargins [line 16317]

    @@ -11857,7 +11858,7 @@ $s)
    -

    method getNumLines [line 5924]

    +

    method getNumLines [line 5923]

    @@ -12011,7 +12012,7 @@ $prefix)
    -

    method getOriginalMargins [line 16344]

    +

    method getOriginalMargins [line 16340]

    @@ -12163,7 +12164,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 14615]

    +

    method getPageGroupAlias [line 14611]

    @@ -12242,7 +12243,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 14630]

    +

    method getPageNumGroupAlias [line 14626]

    @@ -12417,7 +12418,7 @@ $mode)
    -

    method getPDFData [line 10750]

    +

    method getPDFData [line 10745]

    @@ -12442,7 +12443,7 @@ $mode)
    -

    method getRemainingWidth [line 6406]

    +

    method getRemainingWidth [line 6405]

    @@ -12563,7 +12564,7 @@ $mode)
    -

    method getStringHeight [line 6025]

    +

    method getStringHeight [line 6024]

    @@ -12885,7 +12886,7 @@ $tb)
    -

    method getUserPermissionCode [line 11272]

    +

    method getUserPermissionCode [line 11267]

    @@ -12993,7 +12994,7 @@ $y2)
    -

    method GetX [line 7251]

    +

    method GetX [line 7250]

    @@ -13024,7 +13025,7 @@ $y2)
    -

    method GetY [line 7278]

    +

    method GetY [line 7277]

    @@ -13055,7 +13056,7 @@ $y2)
    -

    method get_mqr [line 6923]

    +

    method get_mqr [line 6922]

    @@ -13086,7 +13087,7 @@ $y2)
    -

    method Gradient [line 15211]

    +

    method Gradient [line 15207]

    @@ -13339,7 +13340,7 @@ $charmax = 8])
    -

    method Image [line 6612]

    +

    method Image [line 6611]

    @@ -13477,7 +13478,7 @@ $fitonpage = false])
    -

    method ImageEps [line 15557]

    +

    method ImageEps [line 15553]

    @@ -13579,7 +13580,7 @@ $fitonpage = false])
    -

    method ImagePngAlpha [line 7163]

    +

    method ImagePngAlpha [line 7162]

    @@ -13792,7 +13793,7 @@ $fitonpage = false])
    -

    method IncludeJS [line 13325]

    +

    method IncludeJS [line 13320]

    @@ -14034,7 +14035,7 @@ $resetmargins = false])
    -

    method Line [line 11952]

    +

    method Line [line 11947]

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

    method LinearGradient [line 15061]

    +

    method LinearGradient [line 15057]

    @@ -14250,7 +14251,7 @@ $spaces = 0])
    -

    method ListBox [line 14031]

    +

    method ListBox [line 14025]

    @@ -14340,7 +14341,7 @@ $js = false])
    -

    method Ln [line 7220]

    +

    method Ln [line 7219]

    @@ -14388,7 +14389,7 @@ $cell = false])
    -

    method MirrorH [line 11557]

    +

    method MirrorH [line 11552]

    @@ -14430,7 +14431,7 @@ $x = ''])
    -

    method MirrorL [line 11593]

    +

    method MirrorL [line 11588]

    @@ -14484,7 +14485,7 @@ $y = ''])
    -

    method MirrorP [line 11580]

    +

    method MirrorP [line 11575]

    @@ -14532,7 +14533,7 @@ $y = ''])
    -

    method MirrorV [line 11568]

    +

    method MirrorV [line 11563]

    @@ -14622,7 +14623,7 @@ $topage)
    -

    method MultiCell [line 5576]

    +

    method MultiCell [line 5575]

    @@ -14887,7 +14888,7 @@ $dom)
    -

    method Output [line 7370]

    +

    method Output [line 7369]

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

    method PageNoFormatted [line 14666]

    +

    method PageNoFormatted [line 14662]

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

    method PieSector [line 15496]

    +

    method PieSector [line 15492]

    @@ -15096,7 +15097,7 @@ $o:)
    -

    method PieSectorXY [line 15517]

    +

    method PieSectorXY [line 15513]

    @@ -15204,7 +15205,7 @@ $o:)
    -

    method pixelsToUnits [line 10869]

    +

    method pixelsToUnits [line 10864]

    @@ -15246,7 +15247,7 @@ $px)
    -

    method Polycurve [line 12062]

    +

    method Polycurve [line 12057]

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

    method Polygon [line 12268]

    +

    method Polygon [line 12263]

    @@ -15381,7 +15382,7 @@ $closed = true])
    -

    method PolyLine [line 12249]

    +

    method PolyLine [line 12244]

    @@ -15495,7 +15496,7 @@ $size = 10])
    -

    method RadialGradient [line 15079]

    +

    method RadialGradient [line 15075]

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

    method RadioButton [line 13944]

    +

    method RadioButton [line 13938]

    @@ -15711,7 +15712,7 @@ $file)
    -

    method Rect [line 11980]

    +

    method Rect [line 11975]

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

    method registrationMark [line 15030]

    +

    method registrationMark [line 15026]

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

    method RegularPolygon [line 12366]

    +

    method RegularPolygon [line 12361]

    @@ -15972,7 +15973,7 @@ $r:)
    -

    method removeSHY [line 4948]

    +

    method removeSHY [line 4947]

    @@ -16107,7 +16108,7 @@ $offset = 0])
    -

    method rfread [line 7131]

    +

    method rfread [line 7130]

    @@ -16200,7 +16201,7 @@ $self = false])
    -

    method Rotate [line 11649]

    +

    method Rotate [line 11644]

    @@ -16254,7 +16255,7 @@ $y = ''])
    -

    method RoundedRect [line 12456]

    +

    method RoundedRect [line 12451]

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

    method RoundedRectXY [line 12475]

    +

    method RoundedRectXY [line 12470]

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

    method Scale [line 11525]

    +

    method Scale [line 11520]

    @@ -16494,7 +16495,7 @@ $y = ''])
    -

    method ScaleX [line 11485]

    +

    method ScaleX [line 11480]

    @@ -16548,7 +16549,7 @@ $y = ''])
    -

    method ScaleXY [line 11511]

    +

    method ScaleXY [line 11506]

    @@ -16602,7 +16603,7 @@ $y = ''])
    -

    method ScaleY [line 11498]

    +

    method ScaleY [line 11493]

    @@ -16785,7 +16786,7 @@ $pararray)
    -

    method setAlpha [line 14779]

    +

    method setAlpha [line 14775]

    @@ -16920,7 +16921,7 @@ $margin = 0])
    -

    method setBarcode [line 15814]

    +

    method setBarcode [line 15810]

    @@ -17046,7 +17047,7 @@ $data)
    -

    method setCellHeightRatio [line 14813]

    +

    method setCellHeightRatio [line 14809]

    @@ -17325,7 +17326,7 @@ $font)
    -

    method setDefaultTableColumns [line 14803]

    +

    method setDefaultTableColumns [line 14799]

    @@ -17634,7 +17635,7 @@ $y = ''])
    -

    method setExtGState [line 14745]

    +

    method setExtGState [line 14741]

    @@ -18106,7 +18107,7 @@ $enable = true])
    -

    method setFooterFont [line 10717]

    +

    method setFooterFont [line 10712]

    @@ -18181,7 +18182,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 13828]

    +

    method setFormDefaultProp [line 13822]

    @@ -18344,7 +18345,7 @@ $hs = ''])
    -

    method setHeaderFont [line 10697]

    +

    method setHeaderFont [line 10692]

    @@ -18641,7 +18642,7 @@ $data)
    -

    method setJPEGQuality [line 14790]

    +

    method setJPEGQuality [line 14786]

    @@ -18722,7 +18723,7 @@ $keywords)
    -

    method setLanguageArray [line 10737]

    +

    method setLanguageArray [line 10732]

    @@ -18845,7 +18846,7 @@ $margin)
    -

    method SetLineStyle [line 11802]

    +

    method SetLineStyle [line 11797]

    @@ -18900,7 +18901,7 @@ $ret = false])
    -

    method SetLineWidth [line 11759]

    +

    method SetLineWidth [line 11754]

    @@ -19513,7 +19514,7 @@ $unit)
    -

    method setPDFVersion [line 14832]

    +

    method setPDFVersion [line 14828]

    @@ -19630,7 +19631,7 @@ $val = true])
    -

    method SetProtection [line 11316]

    +

    method SetProtection [line 11311]

    @@ -19822,7 +19823,7 @@ $resetx = true])
    -

    method setSignature [line 14472]

    +

    method setSignature [line 14468]

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

    method setSignatureAppearance [line 14505]

    +

    method setSignatureAppearance [line 14501]

    @@ -20483,7 +20484,7 @@ $margin)
    -

    method setUserRights [line 14439]

    +

    method setUserRights [line 14435]

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

    method setViewerPreferences [line 14845]

    +

    method setViewerPreferences [line 14841]

    @@ -20591,7 +20592,7 @@ $preferences)
    -

    method setVisibility [line 14690]

    +

    method setVisibility [line 14686]

    @@ -20630,7 +20631,7 @@ $v)
    -

    method SetX [line 7291]

    +

    method SetX [line 7290]

    @@ -20678,7 +20679,7 @@ $rtloff = false])
    -

    method SetXY [line 7355]

    +

    method SetXY [line 7354]

    @@ -20732,7 +20733,7 @@ $rtloff = false])
    -

    method SetY [line 7323]

    +

    method SetY [line 7322]

    @@ -20786,7 +20787,7 @@ $rtloff = false])
    -

    method set_mqr [line 6908]

    +

    method set_mqr [line 6907]

    @@ -20825,7 +20826,7 @@ $mqr)
    -

    method Skew [line 11705]

    +

    method Skew [line 11700]

    @@ -20885,7 +20886,7 @@ $y = ''])
    -

    method SkewX [line 11678]

    +

    method SkewX [line 11673]

    @@ -20939,7 +20940,7 @@ $y = ''])
    -

    method SkewY [line 11691]

    +

    method SkewY [line 11686]

    @@ -20993,7 +20994,7 @@ $y = ''])
    -

    method StarPolygon [line 12414]

    +

    method StarPolygon [line 12409]

    @@ -21171,7 +21172,7 @@ $tocpage = false])
    -

    method startPageGroup [line 14525]

    +

    method startPageGroup [line 14521]

    @@ -21292,7 +21293,7 @@ $attribs)
    -

    method StartTransform [line 11453]

    +

    method StartTransform [line 11448]

    @@ -21323,7 +21324,7 @@ $attribs)
    -

    method StopTransform [line 11468]

    +

    method StopTransform [line 11463]

    @@ -21675,7 +21676,7 @@ $page)
    -

    method Text [line 4848]

    +

    method Text [line 4847]

    @@ -21807,7 +21808,7 @@ $rtloff = false])
    -

    method TextField [line 13857]

    +

    method TextField [line 13851]

    @@ -21891,7 +21892,7 @@ $js = false])
    -

    method Transform [line 11735]

    +

    method Transform [line 11730]

    @@ -21933,7 +21934,7 @@ $tm)
    -

    method Translate [line 11628]

    +

    method Translate [line 11623]

    @@ -21981,7 +21982,7 @@ $t_y)
    -

    method TranslateX [line 11605]

    +

    method TranslateX [line 11600]

    @@ -22023,7 +22024,7 @@ $t_x)
    -

    method TranslateY [line 11616]

    +

    method TranslateY [line 11611]

    @@ -22065,7 +22066,7 @@ $t_y)
    -

    method unhtmlentities [line 10880]

    +

    method unhtmlentities [line 10875]

    @@ -22104,7 +22105,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 6445]

    +

    method UniArrSubString [line 6444]

    @@ -22158,7 +22159,7 @@ $end = ''])
    -

    method unichr [line 6478]

    +

    method unichr [line 6477]

    @@ -22203,7 +22204,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 6466]

    +

    method UTF8ArrayToUniArray [line 6465]

    @@ -22245,7 +22246,7 @@ $ta)
    -

    method UTF8ArrSubString [line 6422]

    +

    method UTF8ArrSubString [line 6421]

    @@ -22296,7 +22297,7 @@ $end = ''])
    -

    method UTF8ArrToLatin1 [line 10605]

    +

    method UTF8ArrToLatin1 [line 10600]

    @@ -22338,7 +22339,7 @@ $unicode)
    -

    method utf8Bidi [line 12636]

    +

    method utf8Bidi [line 12631]

    @@ -22395,7 +22396,7 @@ $forcertl = false])
    -

    method utf8StrArrRev [line 12622]

    +

    method utf8StrArrRev [line 12617]

    @@ -22455,7 +22456,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 10440]

    +

    method UTF8StringToArray [line 10435]

    @@ -22521,7 +22522,7 @@ $str)
    -

    method utf8StrRev [line 12607]

    +

    method utf8StrRev [line 12602]

    @@ -22575,7 +22576,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 10575]

    +

    method UTF8ToLatin1 [line 10570]

    @@ -22617,7 +22618,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 10559]

    +

    method UTF8ToUTF16BE [line 10554]

    @@ -22668,7 +22669,7 @@ $setbom = true])
    -

    method Write [line 6065]

    +

    method Write [line 6064]

    @@ -22764,7 +22765,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 15843]

    +

    method write1DBarcode [line 15839]

    @@ -22854,7 +22855,7 @@ $align = ''])
    -

    method write2DBarcode [line 16104]

    +

    method write2DBarcode [line 16100]

    @@ -22944,7 +22945,7 @@ $distort = false])
    -

    method writeBarcode [line 16052]

    +

    method writeBarcode [line 16048]

    @@ -23259,7 +23260,7 @@ $autopadding = true])
    -

    method _addfield [line 13429]

    +

    method _addfield [line 13423]

    @@ -23337,7 +23338,7 @@ $prop)
    -

    method _AES [line 11104]

    +

    method _AES [line 11099]

    @@ -23388,7 +23389,7 @@ $text)
    -

    method _beginpage [line 10125]

    +

    method _beginpage [line 10104]

    @@ -23433,7 +23434,7 @@ $format = ''])
    -

    method _datastring [line 10292]

    +

    method _datastring [line 10285]

    @@ -23478,7 +23479,7 @@ $n = 0])
    -

    method _datestring [line 10307]

    +

    method _datestring [line 10300]

    @@ -23520,7 +23521,7 @@ $n = 0])
    -

    method _destroy [line 7564]

    +

    method _destroy [line 7563]

    @@ -23565,7 +23566,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 7592]

    +

    method _dochecks [line 7591]

    @@ -23590,7 +23591,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 10218]

    +

    method _dolinethrough [line 10211]

    @@ -23638,7 +23639,7 @@ $txt)
    -

    method _dolinethroughw [line 10231]

    +

    method _dolinethroughw [line 10224]

    @@ -23695,7 +23696,7 @@ $txt)
    -

    method _dooverline [line 10244]

    +

    method _dooverline [line 10237]

    @@ -23746,7 +23747,7 @@ $txt)
    -

    method _dooverlinew [line 10257]

    +

    method _dooverlinew [line 10250]

    @@ -23797,7 +23798,7 @@ $w)
    -

    method _dounderline [line 10193]

    +

    method _dounderline [line 10186]

    @@ -23845,7 +23846,7 @@ $txt)
    -

    method _dounderlinew [line 10206]

    +

    method _dounderlinew [line 10199]

    @@ -23896,7 +23897,7 @@ $w)
    -

    method _encrypt_data [line 10913]

    +

    method _encrypt_data [line 10908]

    @@ -23944,7 +23945,7 @@ $s)
    -

    method _enddoc [line 10037]

    +

    method _enddoc [line 10016]

    @@ -23969,7 +23970,7 @@ $s)
    -

    method _endpage [line 10169]

    +

    method _endpage [line 10148]

    @@ -23994,7 +23995,7 @@ $s)
    -

    method _escape [line 10280]

    +

    method _escape [line 10273]

    @@ -24033,7 +24034,7 @@ $s)
    -

    method _escapetext [line 10333]

    +

    method _escapetext [line 10328]

    @@ -24043,7 +24044,7 @@ $s)

    - Format a text string



    + THIS METHOD IS DEPRECATED

    Format a text string




    Tags:

    @@ -24072,7 +24073,7 @@ $s)
    -

    method _freadint [line 10269]

    +

    method _freadint [line 10262]

    @@ -24111,7 +24112,7 @@ $f)
    -

    method _generateencryptionkey [line 11191]

    +

    method _generateencryptionkey [line 11186]

    @@ -24165,7 +24166,7 @@ $protection)
    -

    method _getannotsrefs [line 7841]

    +

    method _getannotsrefs [line 7839]

    @@ -24207,7 +24208,7 @@ $n)
    -

    method _getBYTE [line 8569]

    +

    method _getBYTE [line 8563]

    @@ -24270,7 +24271,7 @@ $offset)
    -

    method _getfontpath [line 7608]

    +

    method _getfontpath [line 7607]

    @@ -24293,9 +24294,51 @@ $offset)
    [ Top ]
    +
    + +

    method _getobj [line 10170]

    +
    +
    +
    + string _getobj( +[int +$objid = '']) +
    +

    + + Return the starting object string for the selected object ID.



    +

    Tags:

    +
    + + + + + + + + + + +
    return:  the starting object string
    since:  5.8.009 (2010-08-20)
    access:  protected
    +
    +

    + + +

    Parameters:

    +
    + + + + + + +
    int  $objid  Object ID (leave empty to get a new ID).
    +

    +
    [ Top ]
    +
    -

    method _getrawstream [line 10353]

    +

    method _getrawstream [line 10348]

    @@ -24343,7 +24386,7 @@ $n = 0])
    -

    method _getSHORT [line 8554]

    +

    method _getSHORT [line 8548]

    @@ -24406,7 +24449,7 @@ $offset)
    -

    method _getstream [line 10368]

    +

    method _getstream [line 10363]

    @@ -24451,7 +24494,7 @@ $n = 0])
    -

    method _getTrueTypeFontSubset [line 8584]

    +

    method _getTrueTypeFontSubset [line 8578]

    @@ -24502,7 +24545,7 @@ $subsetchars)
    -

    method _getTTFtableChecksum [line 8915]

    +

    method _getTTFtableChecksum [line 8909]

    @@ -24553,7 +24596,7 @@ $length)
    -

    method _getULONG [line 8524]

    +

    method _getULONG [line 8518]

    @@ -24616,7 +24659,7 @@ $offset)
    -

    method _getUSHORT [line 8539]

    +

    method _getUSHORT [line 8533]

    @@ -24679,7 +24722,7 @@ $offset)
    -

    method _JScolor [line 13405]

    +

    method _JScolor [line 13399]

    @@ -24721,7 +24764,7 @@ $color)
    -

    method _md5_16 [line 11122]

    +

    method _md5_16 [line 11117]

    @@ -24766,7 +24809,7 @@ $str)
    -

    method _newobj [line 10179]

    +

    method _newobj [line 10158]

    @@ -24794,7 +24837,7 @@ $str)
    -

    method _objectkey [line 10894]

    +

    method _objectkey [line 10889]

    @@ -24836,7 +24879,7 @@ $n)
    -

    method _out [line 10388]

    +

    method _out [line 10383]

    @@ -24872,7 +24915,7 @@ $s)
    -

    method _outCurve [line 11907]

    +

    method _outCurve [line 11902]

    @@ -24941,7 +24984,7 @@ $y3)
    -

    method _outCurveV [line 11921]

    +

    method _outCurveV [line 11916]

    @@ -24998,7 +25041,7 @@ $y3)
    -

    method _outCurveY [line 11937]

    +

    method _outCurveY [line 11932]

    @@ -25067,7 +25110,7 @@ $y2)
    -

    method _outellipticalarc [line 12133]

    +

    method _outellipticalarc [line 12128]

    @@ -25175,7 +25218,7 @@ $angf:)
    -

    method _outLine [line 11877]

    +

    method _outLine [line 11872]

    @@ -25220,7 +25263,7 @@ $y)
    -

    method _outPoint [line 11865]

    +

    method _outPoint [line 11860]

    @@ -25265,7 +25308,7 @@ $y)
    -

    method _outRect [line 11891]

    +

    method _outRect [line 11886]

    @@ -25328,7 +25371,7 @@ $op)
    -

    method _Ovalue [line 11135]

    +

    method _Ovalue [line 11130]

    @@ -25379,7 +25422,7 @@ $owner_pass)
    -

    method _parsejpeg [line 7000]

    +

    method _parsejpeg [line 6999]

    @@ -25418,7 +25461,7 @@ $file)
    -

    method _parsepng [line 7026]

    +

    method _parsepng [line 7025]

    @@ -25457,7 +25500,7 @@ $file)
    -

    method _putannotsobjs [line 7869]

    +

    method _putannotsobjs [line 7867]

    @@ -25488,7 +25531,7 @@ $file)
    -

    method _putannotsrefs [line 7829]

    +

    method _putannotsrefs [line 7827]

    @@ -25533,7 +25576,7 @@ $n)
    -

    method _putAPXObject [line 8482]

    +

    method _putAPXObject [line 8478]

    @@ -25587,7 +25630,7 @@ $stream = ''])
    -

    method _putbookmarks [line 13241]

    +

    method _putbookmarks [line 13236]

    @@ -25618,7 +25661,7 @@ $stream = ''])
    -

    method _putcatalog [line 9867]

    +

    method _putcatalog [line 9846]

    @@ -25646,11 +25689,11 @@ $stream = ''])
    -

    method _putcidfont0 [line 9588]

    +

    method _putcidfont0 [line 9573]

    - int _putcidfont0( + void _putcidfont0( array $font)
    @@ -25660,9 +25703,6 @@ $font)

    Tags:

    - - - @@ -25722,7 +25762,7 @@ $font)
    -

    method _putencryption [line 10937]

    +

    method _putencryption [line 10932]

    return:  font object ID
    author:  Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
    @@ -25753,7 +25793,7 @@ $font)
    -

    method _putextgstates [line 14755]

    +

    method _putextgstates [line 14751]

    @@ -25792,7 +25832,7 @@ $gs)
    -

    method _putfonts [line 9036]

    +

    method _putfonts [line 9030]

    @@ -25820,7 +25860,7 @@ $gs)
    -

    method _putfontwidths [line 8937]

    +

    method _putfontwidths [line 8931]

    @@ -25871,7 +25911,7 @@ $cidoffset = 0])
    -

    method _putheader [line 10029]

    +

    method _putheader [line 10008]

    @@ -25896,7 +25936,7 @@ $cidoffset = 0])
    -

    method _putimages [line 9661]

    +

    method _putimages [line 9643]

    @@ -25921,7 +25961,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 9820]

    +

    method _putinfo [line 9799]

    @@ -25949,7 +25989,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 13350]

    +

    method _putjavascript [line 13345]

    @@ -25980,7 +26020,7 @@ $cidoffset = 0])
    -

    method _putocg [line 14675]

    +

    method _putocg [line 14671]

    @@ -26008,7 +26048,7 @@ $cidoffset = 0])
    -

    method _putpages [line 7619]

    +

    method _putpages [line 7618]

    @@ -26033,7 +26073,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 9735]

    +

    method _putresourcedict [line 9717]

    @@ -26058,7 +26098,7 @@ $cidoffset = 0])
    -

    method _putresources [line 9796]

    +

    method _putresources [line 9778]

    @@ -26083,7 +26123,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 15309]

    +

    method _putshaders [line 15305]

    @@ -26114,7 +26154,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 14363]

    +

    method _putsignature [line 14359]

    @@ -26145,7 +26185,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 9717]

    +

    method _putspotcolors [line 9699]

    diff --git a/tcpdf.php b/tcpdf.php index 2d60d5e..59a0fe8 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.8.008 + * @version 5.8.009 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -4811,9 +4811,8 @@ if (!class_exists('TCPDF', false)) { $data = gzcompress($data); $filter = ' /Filter /FlateDecode'; } - $this->offsets[$filedata['n']] = $this->bufferlen; - $out = $filedata['n'].' 0 obj'."\n"; $stream = $this->_getrawstream($data, $filedata['n']); + $out = $this->_getobj($filedata['n'])."\n"; $out .= '<< /Type /EmbeddedFile'.$filter.' /Length '.strlen($stream).' >>'; $out .= ' stream'."\n".$stream."\n".'endstream'; $out .= "\n".'endobj'; @@ -7807,8 +7806,7 @@ if (!class_exists('TCPDF', false)) { } } //Pages root - $this->offsets[1] = $this->bufferlen; - $out = '1 0 obj'."\n"; + $out = $this->_getobj(1)."\n"; $out .= '<< /Type /Pages /Kids ['; foreach($this->page_obj_id as $page_obj) { $out .= ' '.$page_obj.' 0 R'; @@ -7876,7 +7874,6 @@ if (!class_exists('TCPDF', false)) { // create annotation object for grouping radiobuttons if (isset($this->radiobutton_groups[$n][$pl['txt']]) AND is_array($this->radiobutton_groups[$n][$pl['txt']])) { $radio_button_obj_id = $this->radiobutton_groups[$n][$pl['txt']]['n']; - $this->offsets[$radio_button_obj_id] = $this->bufferlen; $annots = '<<'; $annots .= ' /Type /Annot'; $annots .= ' /Subtype /Widget'; @@ -7897,7 +7894,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' /V /'.$defval; } $annots .= ' >>'; - $this->_out($radio_button_obj_id.' 0 obj'."\n".$annots."\n".'endobj'); + $this->_out($this->_getobj($radio_button_obj_id)."\n".$annots."\n".'endobj'); $this->form_obj_id[] = $radio_button_obj_id; // store object id to be used on Parent entry of Kids $this->radiobutton_groups[$n][$pl['txt']] = $radio_button_obj_id; @@ -8459,8 +8456,7 @@ if (!class_exists('TCPDF', false)) { } $annots .= '>>'; // create new annotation object - $this->offsets[$annot_obj_id] = $this->bufferlen; - $this->_out($annot_obj_id.' 0 obj'."\n".$annots."\n".'endobj'); + $this->_out($this->_getobj($annot_obj_id)."\n".$annots."\n".'endobj'); if ($formfield AND !isset($this->radiobutton_groups[$n][$pl['txt']])) { // store reference of form object $this->form_obj_id[] = $annot_obj_id; @@ -8481,9 +8477,7 @@ if (!class_exists('TCPDF', false)) { */ protected function _putAPXObject($w=0, $h=0, $stream='') { $stream = trim($stream); - ++$this->n; - $this->offsets[$this->n] = $this->bufferlen; - $out = $this->n.' 0 obj'."\n"; + $out = $this->_getobj()."\n"; $out .= '<<'; $out .= ' /Type /XObject'; $out .= ' /Subtype /Form'; @@ -9110,9 +9104,7 @@ if (!class_exists('TCPDF', false)) { $name = $font['name']; if ($type == 'core') { // standard core font - $obj_id = $this->font_obj_ids[$k]; - $this->offsets[$obj_id] = $this->bufferlen; - $out = $obj_id.' 0 obj'."\n"; + $out = $this->_getobj($this->font_obj_ids[$k])."\n"; $out .= '<_out($out); } elseif (($type == 'Type1') OR ($type == 'TrueType')) { // additional Type1 or TrueType font - $obj_id = $this->font_obj_ids[$k]; - $this->offsets[$obj_id] = $this->bufferlen; - $out = $obj_id.' 0 obj'."\n"; + $out = $this->_getobj($this->font_obj_ids[$k])."\n"; $out .= '< * Based on PDF Reference 1.3 (section 5) * @param array $font font data - * @return int font object ID * @access protected * @author Nicola Asuni * @since 1.52.0.TC005 (2005-01-05) @@ -9205,9 +9194,7 @@ if (!class_exists('TCPDF', false)) { $fontname .= $font['name']; // Type0 Font // A composite font composed of other fonts, organized hierarchically - $obj_id = $this->font_obj_ids[$font['fontkey']]; - $this->offsets[$obj_id] = $this->bufferlen; - $out = $obj_id.' 0 obj'."\n"; + $out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n"; $out .= '<< /Type /Font'; $out .= ' /Subtype /Type0'; $out .= ' /BaseFont /'.$fontname; @@ -9503,13 +9490,13 @@ if (!class_exists('TCPDF', false)) { $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(); + $oid = $this->_newobj(); $out = '<< /Type /Font'; $out .= ' /Subtype /CIDFontType2'; $out .= ' /BaseFont /'.$fontname; // A dictionary containing entries that define the character collection of the CIDFont. - $cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry']); - $cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']); + $cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid); + $cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid); $cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement']; $out .= ' /CIDSystemInfo << '.$cidinfo.' >>'; $out .= ' /FontDescriptor '.($this->n + 1).' 0 R'; @@ -9573,14 +9560,12 @@ if (!class_exists('TCPDF', false)) { $out .= "\n".'endobj'; $this->_out($out); } - return $obj_id; } /** * Output CID-0 fonts. * A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format * @param array $font font data - * @return int font object ID * @access protected * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira * @since 3.2.000 (2008-06-23) @@ -9610,9 +9595,7 @@ if (!class_exists('TCPDF', false)) { } else { $longname = $name; } - $obj_id = $this->font_obj_ids[$font['fontkey']]; - $this->offsets[$obj_id] = $this->bufferlen; - $out = $obj_id.' 0 obj'."\n"; + $out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n"; $out .= '<_out($out); - $this->_newobj(); + $oid = $this->_newobj(); $out = '<_datastring($font['cidinfo']['Registry']); - $cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']); + $cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid); + $cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid); $cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement']; $out .= ' /CIDSystemInfo <<'.$cidinfo.'>>'; $out .= ' /FontDescriptor '.($this->n + 1).' 0 R'; @@ -9651,7 +9634,6 @@ if (!class_exists('TCPDF', false)) { $s .= '>>'; $s .= "\n".'endobj'; $this->_out($s); - return $obj_id; } /** @@ -9733,7 +9715,7 @@ if (!class_exists('TCPDF', false)) { * @access protected */ protected function _putresourcedict() { - $out = '2 0 obj'."\n"; + $out = $this->_getobj(2)."\n"; $out .= '<< /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'; $out .= ' /Font <<'; foreach ($this->fontkeys as $fontkey) { @@ -9800,14 +9782,11 @@ if (!class_exists('TCPDF', false)) { $this->_putimages(); $this->_putspotcolors(); $this->_putshaders(); - //Resource dictionary - $this->offsets[2] = $this->bufferlen; $this->_putresourcedict(); $this->_putbookmarks(); $this->_putEmbeddedFiles(); $this->_putannotsobjs(); $this->_putjavascript(); - // encryption $this->_putencryption(); } @@ -9822,30 +9801,30 @@ if (!class_exists('TCPDF', false)) { $out = '<<'; if (!$this->empty_string($this->title)) { // The document's title. - $out .= ' /Title '.$this->_textstring($this->title); + $out .= ' /Title '.$this->_textstring($this->title, $oid); } if (!$this->empty_string($this->author)) { // The name of the person who created the document. - $out .= ' /Author '.$this->_textstring($this->author); + $out .= ' /Author '.$this->_textstring($this->author, $oid); } if (!$this->empty_string($this->subject)) { // The subject of the document. - $out .= ' /Subject '.$this->_textstring($this->subject); + $out .= ' /Subject '.$this->_textstring($this->subject, $oid); } if (!$this->empty_string($this->keywords)) { // Keywords associated with the document. - $out .= ' /Keywords '.$this->_textstring($this->keywords.' TCP'.'DF'); + $out .= ' /Keywords '.$this->_textstring($this->keywords.' TCP'.'DF', $oid); } if (!$this->empty_string($this->creator)) { // If the document was converted to PDF from another format, the name of the conforming product that created the original document from which it was converted. - $out .= ' /Creator '.$this->_textstring($this->creator); + $out .= ' /Creator '.$this->_textstring($this->creator, $oid); } if (defined('PDF_PRODUCER')) { // If the document was converted to PDF from another format, the name of the conforming product that converted it to PDF. - $out .= ' /Producer '.$this->_textstring(PDF_PRODUCER.' (TCP'.'DF)'); + $out .= ' /Producer '.$this->_textstring(PDF_PRODUCER.' (TCP'.'DF)', $oid); } else { // default producer - $out .= ' /Producer '.$this->_textstring('TCP'.'DF'); + $out .= ' /Producer '.$this->_textstring('TCP'.'DF', $oid); } // The date and time the document was created, in human-readable form $out .= ' /CreationDate '.$this->_datestring(); @@ -9884,7 +9863,7 @@ if (!class_exists('TCPDF', false)) { $out .= ' /PageMode /'.$this->PageMode; } if (isset($this->l['a_meta_language'])) { - $out .= ' /Lang '.$this->_textstring($this->l['a_meta_language']); + $out .= ' /Lang '.$this->_textstring($this->l['a_meta_language'], $oid); } $out .= ' /Names <<'; if ((!empty($this->javascript)) OR (!empty($this->js_objects))) { @@ -10065,7 +10044,7 @@ if (!class_exists('TCPDF', false)) { $out .= ' /P '.$this->page_obj_id[($this->signature_appearance['page'])].' 0 R'; // link to signature appearance page $out .= ' /F 4'; $out .= ' /FT /Sig'; - $out .= ' /T '.$this->_textstring('Signature'); + $out .= ' /T '.$this->_textstring('Signature', $this->sig_obj_id); $out .= ' /Ff 0'; $out .= ' /V '.($this->sig_obj_id + 1).' 0 R'; $out .= ' >>'; @@ -10177,12 +10156,26 @@ if (!class_exists('TCPDF', false)) { * @access protected */ protected function _newobj() { - ++$this->n; - $this->offsets[$this->n] = $this->bufferlen; - $this->_out($this->n.' 0 obj'); + $this->_out($this->_getobj()); return $this->n; } + /** + * Return the starting object string for the selected object ID. + * @param int $objid Object ID (leave empty to get a new ID). + * @return string the starting object string + * @access protected + * @since 5.8.009 (2010-08-20) + */ + protected function _getobj($objid='') { + if ($objid === '') { + ++$this->n; + $objid = $this->n; + } + $this->offsets[$objid] = $this->bufferlen; + return $objid.' 0 obj'; + } + /** * Underline text. * @param int $x X coordinate @@ -10325,7 +10318,9 @@ if (!class_exists('TCPDF', false)) { } /** + * THIS METHOD IS DEPRECATED * Format a text string + * @DEPRECATED * @param string $s string to escape. * @return string escaped string. * @access protected @@ -13281,14 +13276,14 @@ if (!class_exists('TCPDF', false)) { $nltags = '/|<\/(blockquote|dd|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|pre|ul|tcpdf|table|tr|td)>/si'; foreach ($this->outlines as $i => $o) { if (isset($this->page_obj_id[($o['p'])])) { - $this->_newobj(); + $oid = $this->_newobj(); // covert HTML title to string $title = preg_replace($nltags, "\n", $o['t']); $title = preg_replace("/[\r]+/si", '', $title); $title = preg_replace("/[\n]+/si", "\n", $title); $title = strip_tags($title); $title = $this->stringTrim($title); - $out = '<_textstring($title); + $out = '<_textstring($title, $oid); $out .= ' /Parent '.($n + $o['parent']).' 0 R'; if (isset($o['prev'])) { $out .= ' /Prev '.($n + $o['prev']).' 0 R'; @@ -13378,9 +13373,9 @@ if (!class_exists('TCPDF', false)) { $this->_out($out); // default Javascript object if (!empty($this->javascript)) { - $this->_newobj(); + $obj_id = $this->_newobj(); $out = '<< /S /JavaScript'; - $out .= ' /JS '.$this->_textstring($this->javascript); + $out .= ' /JS '.$this->_textstring($this->javascript, $obj_id); $out .= ' >>'; $out .= "\n".'endobj'; $this->_out($out); @@ -13388,8 +13383,7 @@ if (!class_exists('TCPDF', false)) { // additional Javascript objects if (!empty($this->js_objects)) { foreach ($this->js_objects as $key => $val) { - $this->offsets[$key] = $this->bufferlen; - $out = $key.' 0 obj'."\n".' << /S /JavaScript /JS '.$this->_textstring($val['js']).' >>'."\n".'endobj'; + $out = $this->_getobj($key)."\n".' << /S /JavaScript /JS '.$this->_textstring($val['js'], $key).' >>'."\n".'endobj'; $this->_out($out); } } @@ -14235,10 +14229,12 @@ if (!class_exists('TCPDF', false)) { if (!isset($popt['mk'])) { $popt['mk'] = array(); } - if (!empty($action) AND (is_array($action))) { - $ann_obj_id = ($this->n + 1); - } else { - $ann_obj_id = ($this->n + 2); + if (!empty($action)) { + if (is_array($action)) { + $ann_obj_id = ($this->n + 1); + } else { + $ann_obj_id = ($this->n + 2); + } } $popt['mk']['ca'] = $this->_textstring($caption, $ann_obj_id); $popt['mk']['rc'] = $this->_textstring($caption, $ann_obj_id); @@ -14364,7 +14360,7 @@ if (!class_exists('TCPDF', false)) { if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) { return; } - $this->_newobj(); + $oid = $this->_newobj(); $out = '<< /Type /Sig'; $out .= ' /Filter /Adobe.PPKLite'; $out .= ' /SubFilter /adbe.pkcs7.detached'; @@ -14405,16 +14401,16 @@ if (!class_exists('TCPDF', false)) { $out .= ' >>'; $out .= ' ]'; // end of reference if (isset($this->signature_data['info']['Name']) AND !$this->empty_string($this->signature_data['info']['Name'])) { - $out .= ' /Name '.$this->_textstring($this->signature_data['info']['Name']); + $out .= ' /Name '.$this->_textstring($this->signature_data['info']['Name'], $oid); } if (isset($this->signature_data['info']['Location']) AND !$this->empty_string($this->signature_data['info']['Location'])) { - $out .= ' /Location '.$this->_textstring($this->signature_data['info']['Location']); + $out .= ' /Location '.$this->_textstring($this->signature_data['info']['Location'], $oid); } if (isset($this->signature_data['info']['Reason']) AND !$this->empty_string($this->signature_data['info']['Reason'])) { - $out .= ' /Reason '.$this->_textstring($this->signature_data['info']['Reason']); + $out .= ' /Reason '.$this->_textstring($this->signature_data['info']['Reason'], $oid); } if (isset($this->signature_data['info']['ContactInfo']) AND !$this->empty_string($this->signature_data['info']['ContactInfo'])) { - $out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo']); + $out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo'], $oid); } $out .= ' /M '.$this->_datestring(); $out .= ' >>'; @@ -14674,9 +14670,9 @@ if (!class_exists('TCPDF', false)) { */ protected function _putocg() { $this->n_ocg_print = $this->_newobj(); - $this->_out('<< /Type /OCG /Name '.$this->_textstring('print').' /Usage << /Print <> /View <> >> >>'."\n".'endobj'); + $this->_out('<< /Type /OCG /Name '.$this->_textstring('print', $this->n_ocg_print).' /Usage << /Print <> /View <> >> >>'."\n".'endobj'); $this->n_ocg_view = $this->_newobj(); - $this->_out('<< /Type /OCG /Name '.$this->_textstring('view').' /Usage << /Print <> /View <> >> >>'."\n".'endobj'); + $this->_out('<< /Type /OCG /Name '.$this->_textstring('view', $this->n_ocg_view).' /Usage << /Print <> /View <> >> >>'."\n".'endobj'); } /** @@ -16443,6 +16439,10 @@ if (!class_exists('TCPDF', false)) { foreach ($matches as $key => $block) { // index 0 contains the CSS selector, index 1 contains CSS properties $cssblocks[$key] = explode('{', $block); + if (!isset($cssblocks[$key][1])) { + // remove empty definitions + unset($cssblocks[$key]); + } } // split groups of selectors (comma-separated list of selectors) foreach ($cssblocks as $key => $block) {
    @@ -26173,7 +26213,7 @@ $cidoffset = 0])
    -

    method _putstream [line 10379]

    +

    method _putstream [line 10374]

    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 244955d..2ca18d9 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 Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/index.html b/doc/index.html index 244955d..2ca18d9 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 Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    @@ -26218,11 +26258,11 @@ $n = 0])
    -

    method _puttruetypeunicode [line 9197]

    +

    method _puttruetypeunicode [line 9186]

    diff --git a/doc/errors.html b/doc/errors.html index ead667a..33c61ed 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -33,9 +33,13 @@
    - int _puttruetypeunicode( + void _puttruetypeunicode( array $font)
    @@ -26232,9 +26272,6 @@ $font)

    Tags:

    - - - @@ -26263,7 +26300,7 @@ $font)
    -

    method _putviewerpreferences [line 9958]

    +

    method _putviewerpreferences [line 9937]

    return:  font object ID
    author:  Nicola Asuni
    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index fb291aa..ff3c142 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -132,7 +132,7 @@
    _escape
    in file tcpdf.php, method TCPDF::_escape()
        Add "\" before "\", "(" and ")"
    _escapetext
    -
    in file tcpdf.php, method TCPDF::_escapetext()
        Format a text string
    +
    in file tcpdf.php, method TCPDF::_escapetext()
        THIS METHOD IS DEPRECATED
    _freadint
    in file tcpdf.php, method TCPDF::_freadint()
        Read a 4-byte (32 bit) integer from file.
    _generateencryptionkey
    @@ -143,6 +143,8 @@
    in file tcpdf.php, method TCPDF::_getBYTE()
        Get BYTE from string (8-bit unsigned integer).
    _getfontpath
    in file tcpdf.php, method TCPDF::_getfontpath()
        Return fonts path
    +
    _getobj
    +
    in file tcpdf.php, method TCPDF::_getobj()
        Return the starting object string for the selected object ID.
    _getrawstream
    in file tcpdf.php, method TCPDF::_getrawstream()
        get raw output stream.
    _getSHORT
    @@ -2074,7 +2076,7 @@ top
    - Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index c9bd0c5..93b3bbe 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1908,7 +1908,7 @@
    _escape
    in file tcpdf.php, method TCPDF::_escape()
        Add "\" before "\", "(" and ")"
    _escapetext
    -
    in file tcpdf.php, method TCPDF::_escapetext()
        Format a text string
    +
    in file tcpdf.php, method TCPDF::_escapetext()
        THIS METHOD IS DEPRECATED
    _freadint
    in file tcpdf.php, method TCPDF::_freadint()
        Read a 4-byte (32 bit) integer from file.
    _generateencryptionkey
    @@ -1919,6 +1919,8 @@
    in file tcpdf.php, method TCPDF::_getBYTE()
        Get BYTE from string (8-bit unsigned integer).
    _getfontpath
    in file tcpdf.php, method TCPDF::_getfontpath()
        Return fonts path
    +
    _getobj
    +
    in file tcpdf.php, method TCPDF::_getobj()
        Return the starting object string for the selected object ID.
    _getrawstream
    in file tcpdf.php, method TCPDF::_getrawstream()
        get raw output stream.
    _getSHORT
    @@ -2042,7 +2044,7 @@ top
    - Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    @@ -26297,7 +26334,7 @@ $font)
    -

    method _RC4 [line 11058]

    +

    method _RC4 [line 11053]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 6c47357..3a1345b 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 Thu, 19 Aug 2010 22:39:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:47 +0200 by phpDocumentor 1.4.3
    @@ -26348,7 +26385,7 @@ $text)
    -

    method _setGDImageTransparency [line 6979]

    +

    method _setGDImageTransparency [line 6978]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index e3f16e9..dbf84cc 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 0fafb99..6b29cfc 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 Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:42 +0200 by phpDocumentor 1.4.3
    @@ -26393,7 +26430,7 @@ $image)
    -

    method _textstring [line 10319]

    +

    method _textstring [line 10312]

    diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 4fb97fb..0c7abc7 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 Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:42 +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 fe0bdbd..025f29d 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 Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:42 +0200 by phpDocumentor 1.4.3
    @@ -26438,7 +26475,7 @@ $n = 0])
    -

    method _toJPEG [line 6942]

    +

    method _toJPEG [line 6941]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 6c7f7be..b0b65bb 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 Thu, 19 Aug 2010 22:39:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:47 +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 c8fda0f..efac36a 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 Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    @@ -26480,7 +26517,7 @@ $file)
    -

    method _toPNG [line 6961]

    +

    method _toPNG [line 6960]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 6ed010f..7863cf4 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 Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 849e97a..110be9e 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
    - Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    @@ -26525,7 +26562,7 @@ $file)
    -

    method _Uvalue [line 11164]

    +

    method _Uvalue [line 11159]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 3f253e6..bb2a00a 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
    - Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:41 +0200 by phpDocumentor 1.4.3
    @@ -26562,7 +26599,7 @@ $file)
    - Documentation generated on Thu, 19 Aug 2010 22:38:56 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:43 +0200 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  5.8.008version:  5.8.009
    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.8.008 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.8.009 (http://www.tcpdf.org)'
    @@ -124,7 +124,7 @@ unicode data

    - Documentation generated on Thu, 19 Aug 2010 22:38:56 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:43 +0200 by phpDocumentor 1.4.3
    Post-parsing
    + +

    tcpdf.php

    +

    Warnings:


    +Warning on line 10327 - Unknown tag "@DEPRECATED" used
    - Documentation generated on Thu, 19 Aug 2010 22:39:00 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 20 Aug 2010 14:33:47 +0200 by phpDocumentor 1.4.3