diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 003e355..31e8d76 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.029 (2010-12-04) + - The $fitbox parameter on Image() method was extended to specify image alignment inside the box (check the example n. 9). + 5.9.028 (2010-12-03) - Font utils makefont.php and makeallttffonts.php were updated. diff --git a/README.TXT b/README.TXT index b317f47..d98ee28 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.028 -Release date: 2010-12-03 +Version: 5.9.029 +Release date: 2010-12-04 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index afb735a..1ef2de8 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -65,7 +65,7 @@

- Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 32f1a5c..4187aaa 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1004,7 +1004,7 @@ $code)

- Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 0a2e16f..0219ef2 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5552,7 +5552,7 @@ $frame)

- Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 89c4821..c253106 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -84,7 +84,7 @@ Source Location: /tcpdf.php

Version:

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

-

$tcpdf_version =  '5.9.028'

+

$tcpdf_version =  '5.9.029'

[line 167]



Tags:

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

method addExtGState [line 15636]

+

method addExtGState [line 15687]

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

method addHtmlLink [line 11410]

+

method addHtmlLink [line 11461]

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

method addHTMLTOC [line 23218]

+

method addHTMLTOC [line 23269]

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

method addHTMLVertSpace [line 21604]

+

method addHTMLVertSpace [line 21655]

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

method addJavascriptObject [line 14220]

+

method addJavascriptObject [line 14271]

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

method addPageRegion [line 24311]

+

method addPageRegion [line 24362]

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

method addTOC [line 23046]

+

method addTOC [line 23097]

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

method AliasNbPages [line 15450]

+

method AliasNbPages [line 15501]

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

method AliasNumPage [line 15477]

+

method AliasNumPage [line 15528]

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

method Arrow [line 13425]

+

method Arrow [line 13476]

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

method arrUTF8ToUTF16BE [line 11305]

+

method arrUTF8ToUTF16BE [line 11356]

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

method Bookmark [line 14092]

+

method Bookmark [line 14143]

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

method Button [line 15106]

+

method Button [line 15157]

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

method CheckBox [line 15036]

+

method CheckBox [line 15087]

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

method checkPageRegions [line 24347]

+

method checkPageRegions [line 24398]

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

method Circle [line 13113]

+

method Circle [line 13164]

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

method Clip [line 16097]

+

method Clip [line 16148]

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

method closeHTMLTagHandler [line 21089]

+

method closeHTMLTagHandler [line 21140]

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

method colorRegistrationBar [line 15772]

+

method colorRegistrationBar [line 15823]

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

method ComboBox [line 14977]

+

method ComboBox [line 15028]

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

method commitTransaction [line 23342]

+

method commitTransaction [line 23393]

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

method convertHexStringToString [line 12229]

+

method convertHexStringToString [line 12280]

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

method convertHTMLColorToDec [line 11454]

+

method convertHTMLColorToDec [line 11505]

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

method convertStringToHexString [line 12251]

+

method convertStringToHexString [line 12302]

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

method convertSVGtMatrix [line 24849]

+

method convertSVGtMatrix [line 24900]

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

method CoonsPatchMesh [line 16012]

+

method CoonsPatchMesh [line 16063]

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

method copyPage [line 22976]

+

method copyPage [line 23027]

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

method cropMark [line 15870]

+

method cropMark [line 15921]

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

method Curve [line 12890]

+

method Curve [line 12941]

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

method deletePage [line 22833]

+

method deletePage [line 22884]

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

method drawHTMLTagBorder [line 21646]

+

method drawHTMLTagBorder [line 21697]

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

method Ellipse [line 12954]

+

method Ellipse [line 13005]

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

method empty_string [line 23396]

+

method empty_string [line 23447]

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

method endSVGElementHandler [line 25977]

+

method endSVGElementHandler [line 26028]

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

method endTemplate [line 24078]

+

method endTemplate [line 24129]

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

method extractCSSproperties [line 17572]

+

method extractCSSproperties [line 17623]

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

method fixHTMLCode [line 17511]

+

method fixHTMLCode [line 17562]

@@ -10387,7 +10387,7 @@ $tidy_options = ''])
-

method formatPageNumber [line 15554]

+

method formatPageNumber [line 15605]

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

method formatTOCPageNumber [line 15566]

+

method formatTOCPageNumber [line 15617]

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

method GetAbsX [line 7833]

+

method GetAbsX [line 7884]

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

method getAliasNbPages [line 15462]

+

method getAliasNbPages [line 15513]

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

method getAliasNumPage [line 15490]

+

method getAliasNumPage [line 15541]

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

method getAnnotOptFromJSProp [line 14345]

+

method getAnnotOptFromJSProp [line 14396]

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

method getBarcode [line 16796]

+

method getBarcode [line 16847]

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

method getBorderStartPosition [line 21630]

+

method getBorderStartPosition [line 21681]

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

method getBuffer [line 22509]

+

method getBuffer [line 22560]

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

method getCellHeightRatio [line 15732]

+

method getCellHeightRatio [line 15783]

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

method getColumn [line 23547]

+

method getColumn [line 23598]

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

method getCSSBorderDashStyle [line 17872]

+

method getCSSBorderDashStyle [line 17923]

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

method getCSSBorderMargin [line 18067]

+

method getCSSBorderMargin [line 18118]

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

method getCSSBorderStyle [line 17908]

+

method getCSSBorderStyle [line 17959]

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

method getCSSBorderWidth [line 17852]

+

method getCSSBorderWidth [line 17903]

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

method getCSSFontSpacing [line 18101]

+

method getCSSFontSpacing [line 18152]

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

method getCSSFontStretching [line 18132]

+

method getCSSFontStretching [line 18183]

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

method getCSSMargin [line 18013]

+

method getCSSMargin [line 18064]

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

method getCSSPadding [line 17959]

+

method getCSSPadding [line 18010]

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

method getEncPermissionsString [line 12268]

+

method getEncPermissionsString [line 12319]

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

method getFontBuffer [line 22673]

+

method getFontBuffer [line 22724]

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

method getFontFamily [line 17485]

+

method getFontFamily [line 17536]

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

method getFontFamilyName [line 23976]

+

method getFontFamilyName [line 24027]

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

method getFontSize [line 17465]

+

method getFontSize [line 17516]

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

method getFontSizePt [line 17475]

+

method getFontSizePt [line 17526]

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

method getFontSpacing [line 24264]

+

method getFontSpacing [line 24315]

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

method getFontStretching [line 24242]

+

method getFontStretching [line 24293]

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

method getFontStyle [line 17495]

+

method getFontStyle [line 17546]

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

method getFontSubsetting [line 23912]

+

method getFontSubsetting [line 23963]

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

method getFooterFont [line 11368]

+

method getFooterFont [line 11419]

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

method getFormDefaultProp [line 14720]

+

method getFormDefaultProp [line 14771]

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

method getGDgamma [line 7769]

+

method getGDgamma [line 7820]

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

method getGraphicVars [line 22300]

+

method getGraphicVars [line 22351]

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

method getGroupPageNo [line 15503]

+

method getGroupPageNo [line 15554]

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

method getGroupPageNoFormatted [line 15513]

+

method getGroupPageNoFormatted [line 15564]

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

method getHeaderFont [line 11348]

+

method getHeaderFont [line 11399]

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

method getHtmlDomArray [line 18202]

+

method getHtmlDomArray [line 18253]

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

method getHTMLUnitToUnits [line 21973]

+

method getHTMLUnitToUnits [line 22024]

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

method getHyphenPatternsFromTEX [line 23713]

+

method getHyphenPatternsFromTEX [line 23764]

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

method getImageBuffer [line 22611]

+

method getImageBuffer [line 22662]

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

method GetLineWidth [line 12630]

+

method GetLineWidth [line 12681]

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

method getMargins [line 17424]

+

method getMargins [line 17475]

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

method getNumberOfColumns [line 23557]

+

method getNumberOfColumns [line 23608]

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

method getObjFilename [line 22423]

+

method getObjFilename [line 22474]

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

method getOriginalMargins [line 17451]

+

method getOriginalMargins [line 17502]

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

method getPageBuffer [line 22552]

+

method getPageBuffer [line 22603]

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

method getPageGroupAlias [line 15525]

+

method getPageGroupAlias [line 15576]

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

method getPageNumGroupAlias [line 15540]

+

method getPageNumGroupAlias [line 15591]

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

method getPageRegions [line 24276]

+

method getPageRegions [line 24327]

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

method getPathPaintOperator [line 23824]

+

method getPathPaintOperator [line 23875]

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

method getPDFData [line 11391]

+

method getPDFData [line 11442]

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

method getRandomSeed [line 11574]

+

method getRandomSeed [line 11625]

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

method getSpaceString [line 18965]

+

method getSpaceString [line 19016]

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

method getSVGTransformMatrix [line 24735]

+

method getSVGTransformMatrix [line 24786]

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

method getTagStyleFromCSS [line 17824]

+

method getTagStyleFromCSS [line 17875]

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

method getTransformationMatrixProduct [line 24831]

+

method getTransformationMatrixProduct [line 24882]

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

method getUserPermissionCode [line 12090]

+

method getUserPermissionCode [line 12141]

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

method getVectorsAngle [line 25492]

+

method getVectorsAngle [line 25543]

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

method GetX [line 7817]

+

method GetX [line 7868]

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

method GetY [line 7844]

+

method GetY [line 7895]

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

method get_mqr [line 7462]

+

method get_mqr [line 7513]

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

method Gradient [line 16121]

+

method Gradient [line 16172]

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

method hyphenateText [line 23752]

+

method hyphenateText [line 23803]

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

method hyphenateWord [line 23643]

+

method hyphenateWord [line 23694]

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

method ImageEps [line 16470]

+

method ImageEps [line 16521]

@@ -14546,7 +14546,7 @@ $dpi = 300], [string $palign = ''], [boolean $ismask = false], [mixed $imgmask = false], [mixed -$border = 0], [boolean +$border = 0], [mixed $fitbox = false], [boolean $hidden = false], [boolean $fitonpage = false]) @@ -14645,9 +14645,9 @@ $fitonpage = false]) Indicates if borders must be drawn around the cell. The value can be a number:
  • 0: no border (default)
  • 1: frame
or a string containing some or all of the following characters (in any order):
  • L: left
  • T: top
  • R: right
  • B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
boolean  mixed   $fitbox  If true scale image dimensions proportionally to fit within the ($w, $h) box.If not false scale image dimensions proportionally to fit within the ($w, $h) box. $fitbox can be true or a 2 characters string indicating the image alignment inside the box. The first character indicate the horizontal alignment (L = left, C = center, R = right) the second character indicate the vertical algnment (T = top, M = middle, B = bottom).
boolean  
@@ -14773,7 +14773,7 @@ $fixoutvals = false])
-

method ImagePngAlpha [line 7708]

+

method ImagePngAlpha [line 7759]

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

method ImageSVG [line 24433]

+

method ImageSVG [line 24484]

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

method IncludeJS [line 14207]

+

method IncludeJS [line 14258]

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

method intToRoman [line 22052]

+

method intToRoman [line 22103]

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

method isUnicodeFont [line 23964]

+

method isUnicodeFont [line 24015]

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

method isValidCSSSelectorForTag [line 17664]

+

method isValidCSSSelectorForTag [line 17715]

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

method Line [line 12807]

+

method Line [line 12858]

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

method LinearGradient [line 15971]

+

method LinearGradient [line 16022]

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

method ListBox [line 14919]

+

method ListBox [line 14970]

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

method Ln [line 7782]

+

method Ln [line 7833]

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

method MirrorH [line 12404]

+

method MirrorH [line 12455]

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

method MirrorL [line 12440]

+

method MirrorL [line 12491]

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

method MirrorP [line 12427]

+

method MirrorP [line 12478]

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

method MirrorV [line 12415]

+

method MirrorV [line 12466]

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

method movePage [line 22690]

+

method movePage [line 22741]

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

method objclone [line 23385]

+

method objclone [line 23436]

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

method openHTMLTagHandler [line 20472]

+

method openHTMLTagHandler [line 20523]

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

method Output [line 7936]

+

method Output [line 7987]

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

method PageNoFormatted [line 15576]

+

method PageNoFormatted [line 15627]

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

method PieSector [line 16408]

+

method PieSector [line 16459]

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

method PieSectorXY [line 16429]

+

method PieSectorXY [line 16480]

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

method pixelsToUnits [line 11549]

+

method pixelsToUnits [line 11600]

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

method Polycurve [line 12917]

+

method Polycurve [line 12968]

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

method Polygon [line 13151]

+

method Polygon [line 13202]

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

method PolyLine [line 13132]

+

method PolyLine [line 13183]

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

method printTemplate [line 24107]

+

method printTemplate [line 24158]

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

method putHtmlListBullet [line 22117]

+

method putHtmlListBullet [line 22168]

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

method RadialGradient [line 15989]

+

method RadialGradient [line 16040]

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

method RadioButton [line 14827]

+

method RadioButton [line 14878]

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

method readDiskCache [line 22463]

+

method readDiskCache [line 22514]

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

method Rect [line 12835]

+

method Rect [line 12886]

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

method registrationMark [line 15940]

+

method registrationMark [line 15991]

@@ -17032,12 +17032,12 @@ $fill_color = array()])
float   $x  Abscissa of upper-left corner (or upper-right corner for RTL language).Abscissa of upper-left corner.
float   $y  Ordinate of upper-left corner (or upper-right corner for RTL language).Ordinate of upper-left corner.
float  
@@ -17142,7 +17142,7 @@ $colb = array(255,255,255)])
-

method RegularPolygon [line 13249]

+

method RegularPolygon [line 13300]

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

method removePageRegion [line 24330]

+

method removePageRegion [line 24381]

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

method replaceBuffer [line 22491]

+

method replaceBuffer [line 22542]

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

method revstrpos [line 23409]

+

method revstrpos [line 23460]

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

method rfread [line 7676]

+

method rfread [line 7727]

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

method rollbackTransaction [line 23356]

+

method rollbackTransaction [line 23407]

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

method Rotate [line 12497]

+

method Rotate [line 12548]

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

method RoundedRect [line 13339]

+

method RoundedRect [line 13390]

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

method RoundedRectXY [line 13358]

+

method RoundedRectXY [line 13409]

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

method Scale [line 12371]

+

method Scale [line 12422]

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

method ScaleX [line 12331]

+

method ScaleX [line 12382]

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

method ScaleXY [line 12357]

+

method ScaleXY [line 12408]

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

method ScaleY [line 12344]

+

method ScaleY [line 12395]

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

method segSVGContentHandler [line 26046]

+

method segSVGContentHandler [line 26097]

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

method selectColumn [line 23472]

+

method selectColumn [line 23523]

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

method serializeTCPDFtagParameters [line 23568]

+

method serializeTCPDFtagParameters [line 23619]

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

method setAlpha [line 15689]

+

method setAlpha [line 15740]

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

method setBarcode [line 16786]

+

method setBarcode [line 16837]

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

method SetBooklet [line 21887]

+

method SetBooklet [line 21938]

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

method setBuffer [line 22473]

+

method setBuffer [line 22524]

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

method setCellHeightRatio [line 15723]

+

method setCellHeightRatio [line 15774]

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

method setColumnsArray [line 23459]

+

method setColumnsArray [line 23510]

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

method setDefaultTableColumns [line 15713]

+

method setDefaultTableColumns [line 15764]

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

method setEqualColumns [line 23426]

+

method setEqualColumns [line 23477]

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

method setExtGState [line 15655]

+

method setExtGState [line 15706]

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

method setFontBuffer [line 22627]

+

method setFontBuffer [line 22678]

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

method setFontSpacing [line 24253]

+

method setFontSpacing [line 24304]

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

method setFontStretching [line 24231]

+

method setFontStretching [line 24282]

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

method setFontSubBuffer [line 22653]

+

method setFontSubBuffer [line 22704]

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

method setFontSubsetting [line 23901]

+

method setFontSubsetting [line 23952]

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

method setFooterFont [line 11358]

+

method setFooterFont [line 11409]

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

method setFormDefaultProp [line 14709]

+

method setFormDefaultProp [line 14760]

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

method setGraphicVars [line 22360]

+

method setGraphicVars [line 22411]

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

method setHeaderFont [line 11338]

+

method setHeaderFont [line 11389]

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

method setHtmlLinksStyle [line 21958]

+

method setHtmlLinksStyle [line 22009]

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

method setHtmlVSpace [line 21927]

+

method setHtmlVSpace [line 21978]

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

method setImageBuffer [line 22568]

+

method setImageBuffer [line 22619]

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

method setImageSubBuffer [line 22591]

+

method setImageSubBuffer [line 22642]

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

method setJPEGQuality [line 15700]

+

method setJPEGQuality [line 15751]

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

method setLanguageArray [line 11378]

+

method setLanguageArray [line 11429]

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

method SetLineStyle [line 12657]

+

method SetLineStyle [line 12708]

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

method SetLineWidth [line 12614]

+

method SetLineWidth [line 12665]

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

method setListIndentWidth [line 21937]

+

method setListIndentWidth [line 21988]

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

method setLIsymbol [line 21843]

+

method setLIsymbol [line 21894]

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

method setOpenCell [line 21947]

+

method setOpenCell [line 21998]

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

method setPageBuffer [line 22525]

+

method setPageBuffer [line 22576]

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

method setPageRegions [line 24291]

+

method setPageRegions [line 24342]

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

method setPDFVersion [line 15742]

+

method setPDFVersion [line 15793]

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

method SetProtection [line 12134]

+

method SetProtection [line 12185]

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

method setRasterizeVectorImages [line 23798]

+

method setRasterizeVectorImages [line 23849]

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

method setSignature [line 15379]

+

method setSignature [line 15430]

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

method setSignatureAppearance [line 15415]

+

method setSignatureAppearance [line 15466]

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

method setSVGStyles [line 24888]

+

method setSVGStyles [line 24939]

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

method setTextRenderingMode [line 23580]

+

method setTextRenderingMode [line 23631]

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

method setUserRights [line 15343]

+

method setUserRights [line 15394]

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

method setViewerPreferences [line 15755]

+

method setViewerPreferences [line 15806]

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

method setVisibility [line 15600]

+

method setVisibility [line 15651]

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

method SetX [line 7857]

+

method SetX [line 7908]

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

method SetXY [line 7921]

+

method SetXY [line 7972]

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

method SetY [line 7889]

+

method SetY [line 7940]

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

method set_mqr [line 7447]

+

method set_mqr [line 7498]

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

method Skew [line 12554]

+

method Skew [line 12605]

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

method SkewX [line 12527]

+

method SkewX [line 12578]

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

method SkewY [line 12540]

+

method SkewY [line 12591]

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

method StarPolygon [line 13297]

+

method StarPolygon [line 13348]

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

method startPageGroup [line 15435]

+

method startPageGroup [line 15486]

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

method startSVGElementHandler [line 25516]

+

method startSVGElementHandler [line 25567]

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

method startTemplate [line 24018]

+

method startTemplate [line 24069]

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

method startTransaction [line 23325]

+

method startTransaction [line 23376]

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

method StartTransform [line 12289]

+

method StartTransform [line 12340]

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

method StopTransform [line 12309]

+

method StopTransform [line 12360]

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

method stringLeftTrim [line 23925]

+

method stringLeftTrim [line 23976]

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

method stringRightTrim [line 23938]

+

method stringRightTrim [line 23989]

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

method stringTrim [line 23951]

+

method stringTrim [line 24002]

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

method SVGPath [line 25168]

+

method SVGPath [line 25219]

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

method SVGTransform [line 24869]

+

method SVGTransform [line 24920]

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

method swapMargins [line 21903]

+

method swapMargins [line 21954]

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

method TextField [line 14738]

+

method TextField [line 14789]

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

method Transform [line 12585]

+

method Transform [line 12636]

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

method Translate [line 12475]

+

method Translate [line 12526]

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

method TranslateX [line 12452]

+

method TranslateX [line 12503]

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

method TranslateY [line 12463]

+

method TranslateY [line 12514]

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

method unhtmlentities [line 11560]

+

method unhtmlentities [line 11611]

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

method UTF8ArrToLatin1 [line 11247]

+

method UTF8ArrToLatin1 [line 11298]

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

method utf8Bidi [line 13519]

+

method utf8Bidi [line 13570]

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

method utf8StrArrRev [line 13505]

+

method utf8StrArrRev [line 13556]

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

method UTF8StringToArray [line 11083]

+

method UTF8StringToArray [line 11134]

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

method utf8StrRev [line 13490]

+

method utf8StrRev [line 13541]

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

method UTF8ToLatin1 [line 11218]

+

method UTF8ToLatin1 [line 11269]

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

method UTF8ToUTF16BE [line 11202]

+

method UTF8ToUTF16BE [line 11253]

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

method write1DBarcode [line 16830]

+

method write1DBarcode [line 16881]

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

method write2DBarcode [line 17201]

+

method write2DBarcode [line 17252]

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

method writeBarcode [line 17136]

+

method writeBarcode [line 17187]

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

method writeDiskCache [line 22435]

+

method writeDiskCache [line 22486]

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

method writeHTML [line 19009]

+

method writeHTML [line 19060]

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

method writeHTMLCell [line 18993]

+

method writeHTMLCell [line 19044]

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

method _addfield [line 14310]

+

method _addfield [line 14361]

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

method _AES [line 11834]

+

method _AES [line 11885]

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

method _beginpage [line 10749]

+

method _beginpage [line 10800]

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

method _datastring [line 10930]

+

method _datastring [line 10981]

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

method _datestring [line 10945]

+

method _datestring [line 10996]

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

method _destroy [line 8140]

+

method _destroy [line 8191]

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

method _dochecks [line 8168]

+

method _dochecks [line 8219]

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

method _dolinethrough [line 10856]

+

method _dolinethrough [line 10907]

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

method _dolinethroughw [line 10869]

+

method _dolinethroughw [line 10920]

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

method _dooverline [line 10882]

+

method _dooverline [line 10933]

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

method _dooverlinew [line 10895]

+

method _dooverlinew [line 10946]

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

method _dounderline [line 10831]

+

method _dounderline [line 10882]

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

method _dounderlinew [line 10844]

+

method _dounderlinew [line 10895]

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

method _encrypt_data [line 11637]

+

method _encrypt_data [line 11688]

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

method _enddoc [line 10677]

+

method _enddoc [line 10728]

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

method _endpage [line 10793]

+

method _endpage [line 10844]

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

method _escape [line 10918]

+

method _escape [line 10969]

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

method _escapetext [line 10973]

+

method _escapetext [line 11024]

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

method _fixAES256Password [line 11960]

+

method _fixAES256Password [line 12011]

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

method _freadint [line 10907]

+

method _freadint [line 10958]

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

method _generateencryptionkey [line 11975]

+

method _generateencryptionkey [line 12026]

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

method _getannotsrefs [line 8416]

+

method _getannotsrefs [line 8467]

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

method _getBYTE [line 9150]

+

method _getBYTE [line 9201]

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

method _getfontpath [line 8184]

+

method _getfontpath [line 8235]

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

method _getobj [line 10815]

+

method _getobj [line 10866]

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

method _getrawstream [line 10993]

+

method _getrawstream [line 11044]

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

method _getSHORT [line 9135]

+

method _getSHORT [line 9186]

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

method _getstream [line 11008]

+

method _getstream [line 11059]

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

method _getTrueTypeFontSubset [line 9165]

+

method _getTrueTypeFontSubset [line 9216]

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

method _getTTFtableChecksum [line 9496]

+

method _getTTFtableChecksum [line 9547]

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

method _getULONG [line 9105]

+

method _getULONG [line 9156]

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

method _getUSHORT [line 9120]

+

method _getUSHORT [line 9171]

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

method _getxobjectdict [line 10361]

+

method _getxobjectdict [line 10412]

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

method _JScolor [line 14286]

+

method _JScolor [line 14337]

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

method _md5_16 [line 11852]

+

method _md5_16 [line 11903]

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

method _newobj [line 10803]

+

method _newobj [line 10854]

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

method _objectkey [line 11617]

+

method _objectkey [line 11668]

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

method _OEvalue [line 11947]

+

method _OEvalue [line 11998]

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

method _out [line 11028]

+

method _out [line 11079]

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

method _outCurve [line 12762]

+

method _outCurve [line 12813]

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

method _outCurveV [line 12776]

+

method _outCurveV [line 12827]

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

method _outCurveY [line 12792]

+

method _outCurveY [line 12843]

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

method _outellipticalarc [line 12991]

+

method _outellipticalarc [line 13042]

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

method _outLine [line 12732]

+

method _outLine [line 12783]

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

method _outPoint [line 12720]

+

method _outPoint [line 12771]

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

method _outRect [line 12746]

+

method _outRect [line 12797]

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

method _Ovalue [line 11909]

+

method _Ovalue [line 11960]

@@ -27236,12 +27236,12 @@ $op)
float   $x  Abscissa of upper-left corner (or upper-right corner for RTL language).Abscissa of upper-left corner.
float   $y  Ordinate of upper-left corner (or upper-right corner for RTL language).Ordinate of upper-left corner.
float  
@@ -27298,7 +27298,7 @@ $op)
-

method _parsejpeg [line 7545]

+

method _parsejpeg [line 7596]

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

method _parsepng [line 7571]

+

method _parsepng [line 7622]

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

method _putannotsobjs [line 8452]

+

method _putannotsobjs [line 8503]

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

method _putannotsrefs [line 8404]

+

method _putannotsrefs [line 8455]

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

method _putAPXObject [line 9064]

+

method _putAPXObject [line 9115]

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

method _putbookmarks [line 14123]

+

method _putbookmarks [line 14174]

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

method _putcatalog [line 10502]

+

method _putcatalog [line 10553]

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

method _putcidfont0 [line 10160]

+

method _putcidfont0 [line 10211]

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

method _putencryption [line 11665]

+

method _putencryption [line 11716]

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

method _putextgstates [line 15665]

+

method _putextgstates [line 15716]

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

method _putfonts [line 9617]

+

method _putfonts [line 9668]

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

method _putfontwidths [line 9518]

+

method _putfontwidths [line 9569]

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

method _putheader [line 10669]

+

method _putheader [line 10720]

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

method _putimages [line 10230]

+

method _putimages [line 10281]

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

method _putinfo [line 10453]

+

method _putinfo [line 10504]

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

method _putjavascript [line 14232]

+

method _putjavascript [line 14283]

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

method _putocg [line 15585]

+

method _putocg [line 15636]

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

method _putpages [line 8195]

+

method _putpages [line 8246]

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

method _putresourcedict [line 10373]

+

method _putresourcedict [line 10424]

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

method _putresources [line 10431]

+

method _putresources [line 10482]

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

method _putshaders [line 16219]

+

method _putshaders [line 16270]

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

method _putsignature [line 15258]

+

method _putsignature [line 15309]

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

method _putspotcolors [line 10341]

+

method _putspotcolors [line 10392]

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

method _putstream [line 11019]

+

method _putstream [line 11070]

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

method _puttruetypeunicode [line 9773]

+

method _puttruetypeunicode [line 9824]

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

method _putviewerpreferences [line 10598]

+

method _putviewerpreferences [line 10649]

diff --git a/examples/example_009.php b/examples/example_009.php index 2780934..cf8bbc8 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-11-15 +// Last Update : 2010-12-04 // // Description : Example 009 for TCPDF class // Test Image @@ -67,7 +67,7 @@ $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set some language-dependent strings $pdf->setLanguageArray($l); -// --------------------------------------------------------- +// ------------------------------------------------------------------- // add a page $pdf->AddPage(); @@ -75,20 +75,71 @@ $pdf->AddPage(); // set JPEG quality $pdf->setJPEGQuality(75); +// Image method signature: // 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 +// Example of Image from data stream ('PHP rules') $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 +// The '@' character is used to indicate that follows an image data stream and not an image file name $pdf->Image('@'.$imgdata); -// --------------------------------------------------------- +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// Image example with resizing +$pdf->Image('../images/image_demo.jpg', 15, 140, 75, 113, 'JPG', 'http://www.tcpdf.org', '', true, 150, '', false, false, 1, false, false, false); + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// test fitbox with all alignment combinations + +$horizontal_alignments = array('L', 'C', 'R'); +$vertical_alignments = array('T', 'M', 'B'); + +$x = 15; +$y = 35; +$w = 30; +$h = 30; +// test all combinations of alignments +for ($i = 0; $i < 3; ++$i) { + $fitbox = $horizontal_alignments[$i].' '; + $x = 15; + for ($j = 0; $j < 3; ++$j) { + $fitbox{1} = $vertical_alignments[$j]; + $pdf->Rect($x, $y, $w, $h, 'F', array(), array(128,255,128)); + $pdf->Image('../images/image_demo.jpg', $x, $y, $w, $h, 'JPG', '', '', false, 300, '', false, false, 0, $fitbox, false, false); + $x += 32; // new column + } + $y += 32; // new row +} + +$x = 115; +$y = 35; +$w = 25; +$h = 50; +for ($i = 0; $i < 3; ++$i) { + $fitbox = $horizontal_alignments[$i].' '; + $x = 115; + for ($j = 0; $j < 3; ++$j) { + $fitbox{1} = $vertical_alignments[$j]; + $pdf->Rect($x, $y, $w, $h, 'F', array(), array(128,255,255)); + $pdf->Image('../images/image_demo.jpg', $x, $y, $w, $h, 'JPG', '', '', false, 300, '', false, false, 0, $fitbox, false, false); + $x += 27; // new column + } + $y += 52; // new row +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// Stretching, position and alignment example + +$pdf->SetXY(110, 200); +$pdf->Image('../images/image_demo.jpg', '', '', 40, 40, '', '', 'T', false, 300, '', false, false, 1, false, false, false); +$pdf->Image('../images/image_demo.jpg', '', '', 40, 40, '', '', '', false, 300, '', false, false, 1, false, false, false); + +// ------------------------------------------------------------------- //Close and output PDF document $pdf->Output('example_009.pdf', 'I'); diff --git a/tcpdf.php b/tcpdf.php index 82fcc24..5c191cc 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @name TCPDF * @package com.tecnick.tcpdf -* @version 5.9.028 +* @version 5.9.029 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS. @@ -164,7 +164,7 @@ class TCPDF { * @var current TCPDF version * @access private */ - private $tcpdf_version = '5.9.028'; + private $tcpdf_version = '5.9.029'; // Protected properties @@ -7119,7 +7119,7 @@ class TCPDF { * @param boolean $ismask true if this image is a mask, false otherwise * @param mixed $imgmask image object returned by this function or false * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:
  • 0: no border (default)
  • 1: frame
or a string containing some or all of the following characters (in any order):
  • L: left
  • T: top
  • R: right
  • B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0))) - * @param boolean $fitbox If true scale image dimensions proportionally to fit within the ($w, $h) box. + * @param mixed $fitbox If not false scale image dimensions proportionally to fit within the ($w, $h) box. $fitbox can be true or a 2 characters string indicating the image alignment inside the box. The first character indicate the horizontal alignment (L = left, C = center, R = right) the second character indicate the vertical algnment (T = top, M = middle, B = bottom). * @param boolean $hidden if true do not display the image. * @param boolean $fitonpage if true the image is resized to not exceed page dimensions. * @return image information @@ -7206,12 +7206,63 @@ class TCPDF { $w = $h * $pixw / $pixh; } elseif ($h <= 0) { $h = $w * $pixh / $pixw; - } elseif ($fitbox AND ($w > 0) AND ($h > 0)) { + } elseif (($fitbox !== false) AND ($w > 0) AND ($h > 0)) { + if (strlen($fitbox) !== 2) { + // set default alignment + $fitbox = '--'; + } // scale image dimensions proportionally to fit within the ($w, $h) box if ((($w * $pixh) / ($h * $pixw)) < 1) { + // store current height + $oldh = $h; + // calculate new height $h = $w * $pixh / $pixw; + // height difference + $hdiff = ($oldh - $h); + // vertical alignment + switch (strtoupper($fitbox{1})) { + case 'T': { + break; + } + case 'M': { + $y += ($hdiff / 2); + break; + } + case 'B': { + $y += $hdiff; + break; + } + } } else { + // store current width + $oldw = $w; + // calculate new width $w = $h * $pixw / $pixh; + // width difference + $wdiff = ($oldw - $w); + // horizontal alignment + switch (strtoupper($fitbox{0})) { + case 'L': { + if ($this->rtl) { + $x -= $wdiff; + } + break; + } + case 'C': { + if ($this->rtl) { + $x -= ($wdiff / 2); + } else { + $x += ($wdiff / 2); + } + break; + } + case 'R': { + if (!$this->rtl) { + $x += $wdiff; + } + break; + } + } } } // fit the image on available space @@ -12735,8 +12786,8 @@ class TCPDF { /** * Append a rectangle to the current path as a complete subpath, with lower-left corner (x, y) and dimensions widthand height in user space. - * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language). - * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language). + * @param float $x Abscissa of upper-left corner. + * @param float $y Ordinate of upper-left corner. * @param float $w Width. * @param float $h Height. * @param string $op options @@ -12815,8 +12866,8 @@ class TCPDF { /** * Draws a rectangle. - * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language). - * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language). + * @param float $x Abscissa of upper-left corner. + * @param float $y Ordinate of upper-left corner. * @param float $w Width. * @param float $h Height. * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 337be6f..fbe109c 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, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28210,7 +28210,7 @@ $font)
-

method _putxobjects [line 10289]

+

method _putxobjects [line 10340]

diff --git a/doc/index.html b/doc/index.html index 337be6f..fbe109c 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, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 8bfeb3f..5a8dcff 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Fri, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:42 +0100 by phpDocumentor 1.4.3
@@ -28244,7 +28244,7 @@ $font)
-

method _RC4 [line 11788]

+

method _RC4 [line 11839]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 56345f0..992c849 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2177,7 +2177,7 @@ top

- Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:35 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 6692d37..071f50d 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2144,7 +2144,7 @@ top

- Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28295,7 +28295,7 @@ $text)
-

method _setGDImageTransparency [line 7524]

+

method _setGDImageTransparency [line 7575]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 0573c6a..c6c9699 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, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:42 +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 9e6fe9c..d3f4c49 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, 03 Dec 2010 15:19:26 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:37 +0100 by phpDocumentor 1.4.3
@@ -28340,7 +28340,7 @@ $image)
-

method _textstring [line 10957]

+

method _textstring [line 11008]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 5bd983f..cad3afb 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, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +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 d312e10..c9595e3 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, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28385,7 +28385,7 @@ $n = 0])
-

method _toJPEG [line 7481]

+

method _toJPEG [line 7532]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 0284f73..572222a 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, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +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 983b809..464f4e5 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, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:42 +0100 by phpDocumentor 1.4.3
@@ -28427,7 +28427,7 @@ $file)
-

method _toPNG [line 7500]

+

method _toPNG [line 7551]

diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index a698d65..123fbae 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, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +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 8ad1494..a4b9441 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, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28472,7 +28472,7 @@ $file)
-

method _UEvalue [line 11896]

+

method _UEvalue [line 11947]

diff --git a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html index d771f77..b296aaf 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, 03 Dec 2010 15:19:31 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:42 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index a04a72e..7c0f9eb 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1378,7 +1378,7 @@ $type)

- Documentation generated on Fri, 03 Dec 2010 15:19:25 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28506,7 +28506,7 @@ $file)
-

method _Uvalue [line 11863]

+

method _Uvalue [line 11914]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 24cb885..c647416 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -300,7 +300,7 @@ $type)

- Documentation generated on Fri, 03 Dec 2010 15:19:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:36 +0100 by phpDocumentor 1.4.3
@@ -28543,7 +28543,7 @@ $file)

- Documentation generated on Fri, 03 Dec 2010 15:19:26 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 04 Dec 2010 11:25:37 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.9.028version:  5.9.029
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