diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 16090d1..8214b15 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,6 +1,10 @@ +5.9.013 (2010-11-15) + - Bug item #3109257 "Problem with interlaced GIFs and PNGs" was fixed. + - Image function now accepts image data streams (check example n. 9). + 5.9.012 (2010-11-12) - Method getTCPDFVersion() was added. - - PDF_PRODUCER constat was removed. + - PDF_PRODUCER constant was removed. - Method convertHTMLColorToDec() was improved. - HTML colors now support spot color names defined on the new spotcolors.php file. - The default method Header() was improved to support SVG and EPS/AI images. @@ -212,7 +216,7 @@ - CSS borders are now supported for HTML tables and other block tags (see example n. 61); - Cell borders were improved (see example n. 57); - Minor bugs were fixed. -encry + ------------------------------------------------------------ 5.6.000 (2010-07-31) diff --git a/README.TXT b/README.TXT index 10ec9d8..4105e4a 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.012 -Release date: 2010-11-12 +Version: 5.9.013 +Release date: 2010-11-15 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 633e9a2..1027295 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -65,7 +65,7 @@

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 2ceaec6..27701f7 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1004,7 +1004,7 @@ $code)

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index d161873..559b38c 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5552,7 +5552,7 @@ $frame)

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index ac3b4bf..31b58b7 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -84,7 +84,7 @@ Source Location: /tcpdf.php

Version:

@@ -783,7 +783,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.9.012 + version:  5.9.013 link:  http://www.tcpdf.org @@ -6337,7 +6337,7 @@ This is a PHP class for generating PDF documents without requiring external exte
[ Top ]

-

$tcpdf_version =  '5.9.012'

+

$tcpdf_version =  '5.9.013'

[line 164]



Tags:

@@ -7243,7 +7243,7 @@ $diskcache = false])
-

method addExtGState [line 15566]

+

method addExtGState [line 15588]

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

method addHtmlLink [line 11347]

+

method addHtmlLink [line 11369]

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

method addHTMLTOC [line 22974]

+

method addHTMLTOC [line 22996]

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

method addHTMLVertSpace [line 21403]

+

method addHTMLVertSpace [line 21425]

@@ -7552,7 +7552,7 @@ $lasttag = false])
-

method addJavascriptObject [line 14150]

+

method addJavascriptObject [line 14172]

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

method addPageRegion [line 24067]

+

method addPageRegion [line 24089]

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

method addTOC [line 22802]

+

method addTOC [line 22824]

@@ -7964,7 +7964,7 @@ $brd = 0])
-

method AliasNbPages [line 15380]

+

method AliasNbPages [line 15402]

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

method AliasNumPage [line 15407]

+

method AliasNumPage [line 15429]

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

method Arrow [line 13355]

+

method Arrow [line 13377]

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

method arrUTF8ToUTF16BE [line 11242]

+

method arrUTF8ToUTF16BE [line 11264]

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

method Bookmark [line 14022]

+

method Bookmark [line 14044]

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

method Button [line 15036]

+

method Button [line 15058]

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

method CheckBox [line 14966]

+

method CheckBox [line 14988]

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

method checkPageRegions [line 24103]

+

method checkPageRegions [line 24125]

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

method Circle [line 13043]

+

method Circle [line 13065]

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

method Clip [line 16027]

+

method Clip [line 16049]

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

method closeHTMLTagHandler [line 20888]

+

method closeHTMLTagHandler [line 20910]

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

method colorRegistrationBar [line 15702]

+

method colorRegistrationBar [line 15724]

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

method ComboBox [line 14907]

+

method ComboBox [line 14929]

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

method commitTransaction [line 23098]

+

method commitTransaction [line 23120]

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

method convertHexStringToString [line 12166]

+

method convertHexStringToString [line 12188]

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

method convertHTMLColorToDec [line 11391]

+

method convertHTMLColorToDec [line 11413]

@@ -9277,7 +9277,7 @@ $hcolor = '#FFFFFF'])
-

method convertStringToHexString [line 12188]

+

method convertStringToHexString [line 12210]

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

method convertSVGtMatrix [line 24593]

+

method convertSVGtMatrix [line 24615]

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

method CoonsPatchMesh [line 15942]

+

method CoonsPatchMesh [line 15964]

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

method copyPage [line 22732]

+

method copyPage [line 22754]

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

method cropMark [line 15800]

+

method cropMark [line 15822]

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

method Curve [line 12827]

+

method Curve [line 12849]

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

method deletePage [line 22589]

+

method deletePage [line 22611]

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

method drawHTMLTagBorder [line 21445]

+

method drawHTMLTagBorder [line 21467]

@@ -9775,7 +9775,7 @@ $xmax)
-

method Ellipse [line 12891]

+

method Ellipse [line 12913]

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

method empty_string [line 23152]

+

method empty_string [line 23174]

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

method endSVGElementHandler [line 25710]

+

method endSVGElementHandler [line 25732]

@@ -10027,7 +10027,7 @@ $name)
-

method endTemplate [line 23834]

+

method endTemplate [line 23856]

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

method extractCSSproperties [line 17379]

+

method extractCSSproperties [line 17401]

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

method formatPageNumber [line 15484]

+

method formatPageNumber [line 15506]

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

method formatTOCPageNumber [line 15496]

+

method formatTOCPageNumber [line 15518]

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

method GetAbsX [line 7787]

+

method GetAbsX [line 7809]

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

method getAliasNbPages [line 15392]

+

method getAliasNbPages [line 15414]

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

method getAliasNumPage [line 15420]

+

method getAliasNumPage [line 15442]

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

method getAnnotOptFromJSProp [line 14275]

+

method getAnnotOptFromJSProp [line 14297]

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

method getBarcode [line 16668]

+

method getBarcode [line 16690]

@@ -10655,7 +10655,7 @@ $position = 'start'])
-

method getBorderStartPosition [line 21429]

+

method getBorderStartPosition [line 21451]

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

method getBuffer [line 22265]

+

method getBuffer [line 22287]

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

method getCellHeightRatio [line 15662]

+

method getCellHeightRatio [line 15684]

@@ -11098,7 +11098,7 @@ $notlast = true])
-

method getColumn [line 23303]

+

method getColumn [line 23325]

@@ -11129,7 +11129,7 @@ $notlast = true])
-

method getCSSBorderDashStyle [line 17679]

+

method getCSSBorderDashStyle [line 17701]

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

method getCSSBorderMargin [line 17874]

+

method getCSSBorderMargin [line 17896]

@@ -11219,7 +11219,7 @@ $width = 0])
-

method getCSSBorderStyle [line 17715]

+

method getCSSBorderStyle [line 17737]

@@ -11261,7 +11261,7 @@ $cssborder)
-

method getCSSBorderWidth [line 17659]

+

method getCSSBorderWidth [line 17681]

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

method getCSSFontSpacing [line 17908]

+

method getCSSFontSpacing [line 17930]

@@ -11351,7 +11351,7 @@ $parent = 0])
-

method getCSSFontStretching [line 17939]

+

method getCSSFontStretching [line 17961]

@@ -11399,7 +11399,7 @@ $parent = 100])
-

method getCSSMargin [line 17820]

+

method getCSSMargin [line 17842]

@@ -11447,7 +11447,7 @@ $width = 0])
-

method getCSSPadding [line 17766]

+

method getCSSPadding [line 17788]

@@ -11495,7 +11495,7 @@ $width = 0])
-

method getEncPermissionsString [line 12205]

+

method getEncPermissionsString [line 12227]

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

method getFontBuffer [line 22429]

+

method getFontBuffer [line 22451]

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

method getFontFamily [line 17357]

+

method getFontFamily [line 17379]

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

method getFontFamilyName [line 23732]

+

method getFontFamilyName [line 23754]

@@ -11769,7 +11769,7 @@ $fontfamily)
-

method getFontSize [line 17337]

+

method getFontSize [line 17359]

@@ -11800,7 +11800,7 @@ $fontfamily)
-

method getFontSizePt [line 17347]

+

method getFontSizePt [line 17369]

@@ -11859,7 +11859,7 @@ $fontfamily)
-

method getFontSpacing [line 24020]

+

method getFontSpacing [line 24042]

@@ -11893,7 +11893,7 @@ $fontfamily)
-

method getFontStretching [line 23998]

+

method getFontStretching [line 24020]

@@ -11927,7 +11927,7 @@ $fontfamily)
-

method getFontStyle [line 17367]

+

method getFontStyle [line 17389]

@@ -11958,7 +11958,7 @@ $fontfamily)
-

method getFontSubsetting [line 23668]

+

method getFontSubsetting [line 23690]

@@ -11992,7 +11992,7 @@ $fontfamily)
-

method getFooterFont [line 11305]

+

method getFooterFont [line 11327]

@@ -12048,7 +12048,7 @@ $fontfamily)
-

method getFormDefaultProp [line 14650]

+

method getFormDefaultProp [line 14672]

@@ -12082,7 +12082,7 @@ $fontfamily)
-

method getGDgamma [line 7723]

+

method getGDgamma [line 7745]

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

method getGraphicVars [line 22056]

+

method getGraphicVars [line 22078]

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

method getGroupPageNo [line 15433]

+

method getGroupPageNo [line 15455]

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

method getGroupPageNoFormatted [line 15443]

+

method getGroupPageNoFormatted [line 15465]

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

method getHeaderFont [line 11285]

+

method getHeaderFont [line 11307]

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

method getHtmlDomArray [line 18009]

+

method getHtmlDomArray [line 18031]

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

method getHTMLUnitToUnits [line 21767]

+

method getHTMLUnitToUnits [line 21789]

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

method getHyphenPatternsFromTEX [line 23469]

+

method getHyphenPatternsFromTEX [line 23491]

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

method getImageBuffer [line 22367]

+

method getImageBuffer [line 22389]

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

method GetLineWidth [line 12567]

+

method GetLineWidth [line 12589]

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

method getMargins [line 17296]

+

method getMargins [line 17318]

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

method getNumberOfColumns [line 23313]

+

method getNumberOfColumns [line 23335]

@@ -12900,7 +12900,7 @@ $border = 0])
-

method getObjFilename [line 22179]

+

method getObjFilename [line 22201]

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

method getOriginalMargins [line 17323]

+

method getOriginalMargins [line 17345]

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

method getPageBuffer [line 22308]

+

method getPageBuffer [line 22330]

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

method getPageGroupAlias [line 15455]

+

method getPageGroupAlias [line 15477]

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

method getPageNumGroupAlias [line 15470]

+

method getPageNumGroupAlias [line 15492]

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

method getPageRegions [line 24032]

+

method getPageRegions [line 24054]

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

method getPathPaintOperator [line 23580]

+

method getPathPaintOperator [line 23602]

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

method getPDFData [line 11328]

+

method getPDFData [line 11350]

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

method getRandomSeed [line 11511]

+

method getRandomSeed [line 11533]

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

method getSpaceString [line 18771]

+

method getSpaceString [line 18793]

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

method getSVGTransformMatrix [line 24479]

+

method getSVGTransformMatrix [line 24501]

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

method getTagStyleFromCSS [line 17631]

+

method getTagStyleFromCSS [line 17653]

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

method getTransformationMatrixProduct [line 24575]

+

method getTransformationMatrixProduct [line 24597]

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

method getUserPermissionCode [line 12027]

+

method getUserPermissionCode [line 12049]

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

method getVectorsAngle [line 25229]

+

method getVectorsAngle [line 25251]

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

method GetX [line 7771]

+

method GetX [line 7793]

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

method GetY [line 7798]

+

method GetY [line 7820]

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

method get_mqr [line 7422]

+

method get_mqr [line 7438]

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

method Gradient [line 16051]

+

method Gradient [line 16073]

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

method hyphenateText [line 23508]

+

method hyphenateText [line 23530]

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

method hyphenateWord [line 23399]

+

method hyphenateWord [line 23421]

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

method ImageEps [line 16399]

+

method ImageEps [line 16421]

@@ -14481,7 +14481,7 @@ $fitonpage = false])
string   $file  Name of the file containing the image.Name of the file containing the image or a '@' character followed by the image data string.
float  
@@ -14671,7 +14671,7 @@ $fitonpage = false])
-

method ImagePngAlpha [line 7662]

+

method ImagePngAlpha [line 7684]

@@ -14788,7 +14788,7 @@ $palign)
-

method ImageSVG [line 24189]

+

method ImageSVG [line 24211]

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

method IncludeJS [line 14137]

+

method IncludeJS [line 14159]

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

method intToRoman [line 21846]

+

method intToRoman [line 21868]

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

method isUnicodeFont [line 23720]

+

method isUnicodeFont [line 23742]

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

method isValidCSSSelectorForTag [line 17471]

+

method isValidCSSSelectorForTag [line 17493]

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

method Line [line 12744]

+

method Line [line 12766]

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

method LinearGradient [line 15901]

+

method LinearGradient [line 15923]

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

method ListBox [line 14849]

+

method ListBox [line 14871]

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

method Ln [line 7736]

+

method Ln [line 7758]

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

method MirrorH [line 12341]

+

method MirrorH [line 12363]

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

method MirrorL [line 12377]

+

method MirrorL [line 12399]

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

method MirrorP [line 12364]

+

method MirrorP [line 12386]

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

method MirrorV [line 12352]

+

method MirrorV [line 12374]

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

method movePage [line 22446]

+

method movePage [line 22468]

@@ -15852,7 +15852,7 @@ $fitcell = false])
-

method objclone [line 23141]

+

method objclone [line 23163]

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

method openHTMLTagHandler [line 20271]

+

method openHTMLTagHandler [line 20293]

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

method Output [line 7890]

+

method Output [line 7912]

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

method PageNoFormatted [line 15506]

+

method PageNoFormatted [line 15528]

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

method PieSector [line 16338]

+

method PieSector [line 16360]

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

method PieSectorXY [line 16359]

+

method PieSectorXY [line 16381]

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

method pixelsToUnits [line 11486]

+

method pixelsToUnits [line 11508]

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

method Polycurve [line 12854]

+

method Polycurve [line 12876]

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

method Polygon [line 13081]

+

method Polygon [line 13103]

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

method PolyLine [line 13062]

+

method PolyLine [line 13084]

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

method printTemplate [line 23863]

+

method printTemplate [line 23885]

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

method putHtmlListBullet [line 21911]

+

method putHtmlListBullet [line 21933]

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

method RadialGradient [line 15919]

+

method RadialGradient [line 15941]

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

method RadioButton [line 14757]

+

method RadioButton [line 14779]

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

method readDiskCache [line 22219]

+

method readDiskCache [line 22241]

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

method Rect [line 12772]

+

method Rect [line 12794]

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

method registrationMark [line 15870]

+

method registrationMark [line 15892]

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

method RegularPolygon [line 13179]

+

method RegularPolygon [line 13201]

@@ -17151,7 +17151,7 @@ $r:)
-

method removePageRegion [line 24086]

+

method removePageRegion [line 24108]

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

method replaceBuffer [line 22247]

+

method replaceBuffer [line 22269]

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

method revstrpos [line 23165]

+

method revstrpos [line 23187]

@@ -17359,7 +17359,7 @@ $offset = 0])
-

method rfread [line 7630]

+

method rfread [line 7652]

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

method rollbackTransaction [line 23112]

+

method rollbackTransaction [line 23134]

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

method Rotate [line 12434]

+

method Rotate [line 12456]

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

method RoundedRect [line 13269]

+

method RoundedRect [line 13291]

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

method RoundedRectXY [line 13288]

+

method RoundedRectXY [line 13310]

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

method Scale [line 12308]

+

method Scale [line 12330]

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

method ScaleX [line 12268]

+

method ScaleX [line 12290]

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

method ScaleXY [line 12294]

+

method ScaleXY [line 12316]

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

method ScaleY [line 12281]

+

method ScaleY [line 12303]

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

method segSVGContentHandler [line 25779]

+

method segSVGContentHandler [line 25801]

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

method selectColumn [line 23228]

+

method selectColumn [line 23250]

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

method serializeTCPDFtagParameters [line 23324]

+

method serializeTCPDFtagParameters [line 23346]

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

method setAlpha [line 15619]

+

method setAlpha [line 15641]

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

method setBarcode [line 16658]

+

method setBarcode [line 16680]

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

method SetBooklet [line 21681]

+

method SetBooklet [line 21703]

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

method setBuffer [line 22229]

+

method setBuffer [line 22251]

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

method setCellHeightRatio [line 15653]

+

method setCellHeightRatio [line 15675]

@@ -18499,7 +18499,7 @@ $bottom = ''])
-

method setColumnsArray [line 23215]

+

method setColumnsArray [line 23237]

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

method setDefaultTableColumns [line 15643]

+

method setDefaultTableColumns [line 15665]

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

method setEqualColumns [line 23182]

+

method setEqualColumns [line 23204]

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

method setExtGState [line 15585]

+

method setExtGState [line 15607]

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

method setFontBuffer [line 22383]

+

method setFontBuffer [line 22405]

@@ -19384,7 +19384,7 @@ $out = true])
-

method setFontSpacing [line 24009]

+

method setFontSpacing [line 24031]

@@ -19426,7 +19426,7 @@ $spacing = 0])
-

method setFontStretching [line 23987]

+

method setFontStretching [line 24009]

@@ -19468,7 +19468,7 @@ $perc = 100])
-

method setFontSubBuffer [line 22409]

+

method setFontSubBuffer [line 22431]

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

method setFontSubsetting [line 23657]

+

method setFontSubsetting [line 23679]

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

method setFooterFont [line 11295]

+

method setFooterFont [line 11317]

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

method setFormDefaultProp [line 14639]

+

method setFormDefaultProp [line 14661]

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

method setGraphicVars [line 22116]

+

method setGraphicVars [line 22138]

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

method setHeaderFont [line 11275]

+

method setHeaderFont [line 11297]

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

method setHtmlLinksStyle [line 21752]

+

method setHtmlLinksStyle [line 21774]

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

method setHtmlVSpace [line 21721]

+

method setHtmlVSpace [line 21743]

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

method setImageBuffer [line 22324]

+

method setImageBuffer [line 22346]

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

method setImageSubBuffer [line 22347]

+

method setImageSubBuffer [line 22369]

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

method setJPEGQuality [line 15630]

+

method setJPEGQuality [line 15652]

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

method setLanguageArray [line 11315]

+

method setLanguageArray [line 11337]

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

method SetLineStyle [line 12594]

+

method SetLineStyle [line 12616]

@@ -20389,7 +20389,7 @@ $ret = false])
-

method SetLineWidth [line 12551]

+

method SetLineWidth [line 12573]

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

method setListIndentWidth [line 21731]

+

method setListIndentWidth [line 21753]

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

method setLIsymbol [line 21642]

+

method setLIsymbol [line 21664]

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

method setOpenCell [line 21741]

+

method setOpenCell [line 21763]

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

method setPageBuffer [line 22281]

+

method setPageBuffer [line 22303]

@@ -20963,7 +20963,7 @@ $bottommargin = ''])
-

method setPageRegions [line 24047]

+

method setPageRegions [line 24069]

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

method setPDFVersion [line 15672]

+

method setPDFVersion [line 15694]

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

method SetProtection [line 12071]

+

method SetProtection [line 12093]

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

method setRasterizeVectorImages [line 23554]

+

method setRasterizeVectorImages [line 23576]

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

method setSignature [line 15309]

+

method setSignature [line 15331]

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

method setSignatureAppearance [line 15345]

+

method setSignatureAppearance [line 15367]

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

method setSVGStyles [line 24632]

+

method setSVGStyles [line 24654]

@@ -21852,7 +21852,7 @@ $ret = false])
-

method setTextRenderingMode [line 23336]

+

method setTextRenderingMode [line 23358]

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

method setUserRights [line 15273]

+

method setUserRights [line 15295]

@@ -22113,7 +22113,7 @@ $formex = ''])
-

method setViewerPreferences [line 15685]

+

method setViewerPreferences [line 15707]

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

method setVisibility [line 15530]

+

method setVisibility [line 15552]

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

method SetX [line 7811]

+

method SetX [line 7833]

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

method SetXY [line 7875]

+

method SetXY [line 7897]

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

method SetY [line 7843]

+

method SetY [line 7865]

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

method set_mqr [line 7407]

+

method set_mqr [line 7423]

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

method Skew [line 12491]

+

method Skew [line 12513]

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

method SkewX [line 12464]

+

method SkewX [line 12486]

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

method SkewY [line 12477]

+

method SkewY [line 12499]

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

method StarPolygon [line 13227]

+

method StarPolygon [line 13249]

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

method startPageGroup [line 15365]

+

method startPageGroup [line 15387]

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

method startSVGElementHandler [line 25253]

+

method startSVGElementHandler [line 25275]

@@ -22834,7 +22834,7 @@ $ctm = array()])
-

method startTemplate [line 23774]

+

method startTemplate [line 23796]

@@ -22888,7 +22888,7 @@ $h = 0])
-

method startTransaction [line 23081]

+

method startTransaction [line 23103]

@@ -22916,7 +22916,7 @@ $h = 0])
-

method StartTransform [line 12226]

+

method StartTransform [line 12248]

@@ -22947,7 +22947,7 @@ $h = 0])
-

method StopTransform [line 12246]

+

method StopTransform [line 12268]

@@ -22978,7 +22978,7 @@ $h = 0])
-

method stringLeftTrim [line 23681]

+

method stringLeftTrim [line 23703]

@@ -23029,7 +23029,7 @@ $replace = ''])
-

method stringRightTrim [line 23694]

+

method stringRightTrim [line 23716]

@@ -23080,7 +23080,7 @@ $replace = ''])
-

method stringTrim [line 23707]

+

method stringTrim [line 23729]

@@ -23131,7 +23131,7 @@ $replace = ''])
-

method SVGPath [line 24909]

+

method SVGPath [line 24931]

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

method SVGTransform [line 24613]

+

method SVGTransform [line 24635]

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

method swapMargins [line 21697]

+

method swapMargins [line 21719]

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

method TextField [line 14668]

+

method TextField [line 14690]

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

method Transform [line 12522]

+

method Transform [line 12544]

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

method Translate [line 12412]

+

method Translate [line 12434]

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

method TranslateX [line 12389]

+

method TranslateX [line 12411]

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

method TranslateY [line 12400]

+

method TranslateY [line 12422]

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

method unhtmlentities [line 11497]

+

method unhtmlentities [line 11519]

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

method UTF8ArrToLatin1 [line 11184]

+

method UTF8ArrToLatin1 [line 11206]

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

method utf8Bidi [line 13449]

+

method utf8Bidi [line 13471]

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

method utf8StrArrRev [line 13435]

+

method utf8StrArrRev [line 13457]

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

method UTF8StringToArray [line 11020]

+

method UTF8StringToArray [line 11042]

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

method utf8StrRev [line 13420]

+

method utf8StrRev [line 13442]

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

method UTF8ToLatin1 [line 11155]

+

method UTF8ToLatin1 [line 11177]

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

method UTF8ToUTF16BE [line 11139]

+

method UTF8ToUTF16BE [line 11161]

@@ -24400,7 +24400,7 @@ $margin = ''])
-

method write1DBarcode [line 16702]

+

method write1DBarcode [line 16724]

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

method write2DBarcode [line 17073]

+

method write2DBarcode [line 17095]

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

method writeBarcode [line 17008]

+

method writeBarcode [line 17030]

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

method writeDiskCache [line 22191]

+

method writeDiskCache [line 22213]

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

method writeHTML [line 18815]

+

method writeHTML [line 18837]

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

method writeHTMLCell [line 18799]

+

method writeHTMLCell [line 18821]

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

method _addfield [line 14240]

+

method _addfield [line 14262]

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

method _AES [line 11771]

+

method _AES [line 11793]

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

method _beginpage [line 10686]

+

method _beginpage [line 10708]

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

method _datastring [line 10867]

+

method _datastring [line 10889]

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

method _datestring [line 10882]

+

method _datestring [line 10904]

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

method _destroy [line 8084]

+

method _destroy [line 8106]

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

method _dochecks [line 8112]

+

method _dochecks [line 8134]

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

method _dolinethrough [line 10793]

+

method _dolinethrough [line 10815]

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

method _dolinethroughw [line 10806]

+

method _dolinethroughw [line 10828]

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

method _dooverline [line 10819]

+

method _dooverline [line 10841]

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

method _dooverlinew [line 10832]

+

method _dooverlinew [line 10854]

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

method _dounderline [line 10768]

+

method _dounderline [line 10790]

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

method _dounderlinew [line 10781]

+

method _dounderlinew [line 10803]

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

method _encrypt_data [line 11574]

+

method _encrypt_data [line 11596]

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

method _enddoc [line 10614]

+

method _enddoc [line 10636]

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

method _endpage [line 10730]

+

method _endpage [line 10752]

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

method _escape [line 10855]

+

method _escape [line 10877]

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

method _escapetext [line 10910]

+

method _escapetext [line 10932]

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

method _fixAES256Password [line 11897]

+

method _fixAES256Password [line 11919]

@@ -25759,7 +25759,7 @@ $password)
-

method _freadint [line 10844]

+

method _freadint [line 10866]

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

method _generateencryptionkey [line 11912]

+

method _generateencryptionkey [line 11934]

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

method _getannotsrefs [line 8360]

+

method _getannotsrefs [line 8382]

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

method _getBYTE [line 9094]

+

method _getBYTE [line 9116]

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

method _getfontpath [line 8128]

+

method _getfontpath [line 8150]

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

method _getobj [line 10752]

+

method _getobj [line 10774]

@@ -26001,7 +26001,7 @@ $objid = ''])
-

method _getrawstream [line 10930]

+

method _getrawstream [line 10952]

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

method _getSHORT [line 9079]

+

method _getSHORT [line 9101]

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

method _getstream [line 10945]

+

method _getstream [line 10967]

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

method _getTrueTypeFontSubset [line 9109]

+

method _getTrueTypeFontSubset [line 9131]

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

method _getTTFtableChecksum [line 9440]

+

method _getTTFtableChecksum [line 9462]

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

method _getULONG [line 9049]

+

method _getULONG [line 9071]

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

method _getUSHORT [line 9064]

+

method _getUSHORT [line 9086]

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

method _getxobjectdict [line 10305]

+

method _getxobjectdict [line 10327]

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

method _JScolor [line 14216]

+

method _JScolor [line 14238]

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

method _md5_16 [line 11789]

+

method _md5_16 [line 11811]

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

method _newobj [line 10740]

+

method _newobj [line 10762]

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

method _objectkey [line 11554]

+

method _objectkey [line 11576]

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

method _OEvalue [line 11884]

+

method _OEvalue [line 11906]

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

method _out [line 10965]

+

method _out [line 10987]

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

method _outCurve [line 12699]

+

method _outCurve [line 12721]

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

method _outCurveV [line 12713]

+

method _outCurveV [line 12735]

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

method _outCurveY [line 12729]

+

method _outCurveY [line 12751]

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

method _outellipticalarc [line 12926]

+

method _outellipticalarc [line 12948]

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

method _outLine [line 12669]

+

method _outLine [line 12691]

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

method _outPoint [line 12657]

+

method _outPoint [line 12679]

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

method _outRect [line 12683]

+

method _outRect [line 12705]

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

method _Ovalue [line 11846]

+

method _Ovalue [line 11868]

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

method _parsejpeg [line 7499]

+

method _parsejpeg [line 7521]

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

method _parsepng [line 7525]

+

method _parsepng [line 7547]

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

method _putannotsobjs [line 8396]

+

method _putannotsobjs [line 8418]

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

method _putannotsrefs [line 8348]

+

method _putannotsrefs [line 8370]

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

method _putAPXObject [line 9008]

+

method _putAPXObject [line 9030]

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

method _putbookmarks [line 14053]

+

method _putbookmarks [line 14075]

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

method _putcatalog [line 10439]

+

method _putcatalog [line 10461]

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

method _putcidfont0 [line 10104]

+

method _putcidfont0 [line 10126]

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

method _putencryption [line 11602]

+

method _putencryption [line 11624]

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

method _putextgstates [line 15595]

+

method _putextgstates [line 15617]

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

method _putfonts [line 9561]

+

method _putfonts [line 9583]

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

method _putfontwidths [line 9462]

+

method _putfontwidths [line 9484]

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

method _putheader [line 10606]

+

method _putheader [line 10628]

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

method _putimages [line 10174]

+

method _putimages [line 10196]

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

method _putinfo [line 10397]

+

method _putinfo [line 10419]

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

method _putjavascript [line 14162]

+

method _putjavascript [line 14184]

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

method _putocg [line 15515]

+

method _putocg [line 15537]

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

method _putpages [line 8139]

+

method _putpages [line 8161]

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

method _putresourcedict [line 10317]

+

method _putresourcedict [line 10339]

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

method _putresources [line 10375]

+

method _putresources [line 10397]

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

method _putshaders [line 16149]

+

method _putshaders [line 16171]

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

method _putsignature [line 15188]

+

method _putsignature [line 15210]

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

method _putspotcolors [line 10285]

+

method _putspotcolors [line 10307]

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

method _putstream [line 10956]

+

method _putstream [line 10978]

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

method _puttruetypeunicode [line 9717]

+

method _puttruetypeunicode [line 9739]

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

method _putviewerpreferences [line 10535]

+

method _putviewerpreferences [line 10557]

diff --git a/examples/example_009.php b/examples/example_009.php index 36d122e..2780934 100755 --- a/examples/example_009.php +++ b/examples/example_009.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_009.php // Begin : 2008-03-04 -// Last Update : 2010-08-08 +// Last Update : 2010-11-15 // // Description : Example 009 for TCPDF class // Test Image @@ -77,14 +77,22 @@ $pdf->setJPEGQuality(75); // Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false) + // Image example $pdf->Image('../images/image_demo.jpg', 50, 50, 100, 150, 'JPG', 'http://www.tcpdf.org', '', true, 150, '', false, false, 1, false, false, false); + +// Example of Image from data stream +$imgdata = base64_decode('iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABlBMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDrEX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg=='); + +// The '@' character is used to indicate that follows image data stream and not image file name +$pdf->Image('@'.$imgdata); + // --------------------------------------------------------- //Close and output PDF document $pdf->Output('example_009.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/tcpdf.php b/tcpdf.php index 05a62e0..3fd16c5 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @name TCPDF * @package com.tecnick.tcpdf -* @version 5.9.012 +* @version 5.9.013 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -161,7 +161,7 @@ class TCPDF { * @var current TCPDF version * @access private */ - private $tcpdf_version = '5.9.012'; + private $tcpdf_version = '5.9.013'; // Protected properties @@ -7081,7 +7081,7 @@ class TCPDF { * The format can be specified explicitly or inferred from the file extension.
* It is possible to put a link on the image.
* Remark: if an image is used several times, only one copy will be embedded in the file.
- * @param string $file Name of the file containing the image. + * @param string $file Name of the file containing the image or a '@' character followed by the image data string. * @param float $x Abscissa of the upper-left corner (LTR) or upper-right corner (RTL). * @param float $y Ordinate of the upper-left corner (LTR) or upper-right corner (RTL). * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated. @@ -7112,44 +7112,60 @@ class TCPDF { // check page for no-write regions and adapt page margins if necessary $this->checkPageRegions($h, $x, $y); $cached_file = false; // true when the file is cached - // check if is local file - if (!@file_exists($file)) { - // encode spaces on filename (file is probably an URL) - $file = str_replace(' ', '%20', $file); - } - // get image dimensions - $imsize = @getimagesize($file); - if ($imsize === FALSE) { - if (function_exists('curl_init')) { - // try to get remote file data using cURL - $cs = curl_init(); // curl session - curl_setopt($cs, CURLOPT_URL, $file); - curl_setopt($cs, CURLOPT_BINARYTRANSFER, true); - curl_setopt($cs, CURLOPT_FAILONERROR, true); - curl_setopt($cs, CURLOPT_RETURNTRANSFER, true); - curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5); - curl_setopt($cs, CURLOPT_TIMEOUT, 30); - $imgdata = curl_exec($cs); - curl_close($cs); - if($imgdata !== FALSE) { - // copy image to cache - $file = tempnam(K_PATH_CACHE, 'img_'); - $fp = fopen($file, 'w'); - fwrite($fp, $imgdata); - fclose($fp); - unset($imgdata); - $cached_file = true; - $imsize = @getimagesize($file); - if ($imsize === FALSE) { - unlink($file); - $cached_file = false; + // check if we are passing an image as file or string + if ($file{0} === '@') { // image from string + $imgdata = substr($file, 1); + $file = tempnam(K_PATH_CACHE, 'img_'); + $fp = fopen($file, 'w'); + fwrite($fp, $imgdata); + fclose($fp); + unset($imgdata); + $cached_file = true; + $imsize = @getimagesize($file); + if ($imsize === FALSE) { + unlink($file); + $cached_file = false; + } + } else { // image file + // check if is local file + if (!@file_exists($file)) { + // encode spaces on filename (file is probably an URL) + $file = str_replace(' ', '%20', $file); + } + // get image dimensions + $imsize = @getimagesize($file); + if ($imsize === FALSE) { + if (function_exists('curl_init')) { + // try to get remote file data using cURL + $cs = curl_init(); // curl session + curl_setopt($cs, CURLOPT_URL, $file); + curl_setopt($cs, CURLOPT_BINARYTRANSFER, true); + curl_setopt($cs, CURLOPT_FAILONERROR, true); + curl_setopt($cs, CURLOPT_RETURNTRANSFER, true); + curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5); + curl_setopt($cs, CURLOPT_TIMEOUT, 30); + $imgdata = curl_exec($cs); + curl_close($cs); + if($imgdata !== FALSE) { + // copy image to cache + $file = tempnam(K_PATH_CACHE, 'img_'); + $fp = fopen($file, 'w'); + fwrite($fp, $imgdata); + fclose($fp); + unset($imgdata); + $cached_file = true; + $imsize = @getimagesize($file); + if ($imsize === FALSE) { + unlink($file); + $cached_file = false; + } } + } elseif (($w > 0) AND ($h > 0)) { + // get measures from specified data + $pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k; + $ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k; + $imsize = array($pw, $ph); } - } elseif (($w > 0) AND ($h > 0)) { - // get measures from specified data - $pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k; - $ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k; - $imsize = array($pw, $ph); } } if ($imsize === FALSE) { @@ -7458,9 +7474,15 @@ class TCPDF { * @since 4.9.016 (2010-04-20) */ protected function _toPNG($image) { + // set temporary image file name $tempname = tempnam(K_PATH_CACHE, 'jpg_'); + // turn off interlaced mode + imageinterlace($image, 0); + // create temporary PNG image imagepng($image, $tempname); + // remove image from memory imagedestroy($image); + // get PNG image data $retvars = $this->_parsepng($tempname); // tidy up by removing temporary image unlink($tempname);
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index ed358fc..4fbca19 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
@@ -28051,7 +28051,7 @@ $font)
-

method _putxobjects [line 10233]

+

method _putxobjects [line 10255]

diff --git a/doc/index.html b/doc/index.html index ed358fc..4fbca19 100644 --- a/doc/index.html +++ b/doc/index.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 16bc99a..cbffe2d 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Fri, 12 Nov 2010 14:39:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by phpDocumentor 1.4.3
@@ -28085,7 +28085,7 @@ $font)
-

method _RC4 [line 11725]

+

method _RC4 [line 11747]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 12ff6ec..4ef7aca 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2171,7 +2171,7 @@ top

- Documentation generated on Fri, 12 Nov 2010 14:39:52 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index d494500..613016e 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2138,7 +2138,7 @@ top

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
@@ -28136,7 +28136,7 @@ $text)
-

method _setGDImageTransparency [line 7478]

+

method _setGDImageTransparency [line 7500]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 0b29b35..458be56 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -103,7 +103,7 @@ Unicode data class for TCPDF library.




- Documentation generated on Fri, 12 Nov 2010 14:39:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 2eb3963..70f5342 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -83,7 +83,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -110,7 +110,7 @@ main configuration file

(define the K_TCPDF_EXTERNAL_CONFIG consta


- Documentation generated on Fri, 12 Nov 2010 14:39:55 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:09 +0100 by phpDocumentor 1.4.3
@@ -28181,7 +28181,7 @@ $image)
-

method _textstring [line 10894]

+

method _textstring [line 10916]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 888f4b3..412deda 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -481,7 +481,7 @@ string $string, [int $split_length = 1])

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 9bc103a..a6b2b15 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -158,7 +158,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO


- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by phpDocumentor 1.4.3
@@ -28226,7 +28226,7 @@ $n = 0])
-

method _toJPEG [line 7441]

+

method _toJPEG [line 7457]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 6373c64..450b3e4 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -98,7 +98,7 @@ Array of WEB safe colors




- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index fa15c6f..a618cbc 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -543,7 +543,7 @@ Configuration file for TCPDF.




- Documentation generated on Fri, 12 Nov 2010 14:39:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by phpDocumentor 1.4.3
@@ -28268,7 +28268,7 @@ $file)
-

method _toPNG [line 7460]

+

method _toPNG [line 7476]

diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 3c4a34e..3ca8d40 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 2789caf..22cc13a 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
@@ -28313,7 +28313,7 @@ $file)
-

method _UEvalue [line 11833]

+

method _UEvalue [line 11855]

diff --git a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html index 93a4d67..6a301e9 100644 --- a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html +++ b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html @@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library



- Documentation generated on Fri, 12 Nov 2010 14:39:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 16193fc..b2ca42c 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1378,7 +1378,7 @@ $type)

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
@@ -28347,7 +28347,7 @@ $file)
-

method _Uvalue [line 11800]

+

method _Uvalue [line 11822]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 79f9553..75b7026 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -300,7 +300,7 @@ $type)

- Documentation generated on Fri, 12 Nov 2010 14:39:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by phpDocumentor 1.4.3
@@ -28384,7 +28384,7 @@ $file)

- Documentation generated on Fri, 12 Nov 2010 14:39:55 +0100 by phpDocumentor 1.4.3 + Documentation generated on Mon, 15 Nov 2010 10:34:09 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.9.012version:  5.9.013
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