diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index cc3b2f0..efc25f9 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +4.8.019 (2009-12-16) + - Bug item #2915684 "Image size" was fixed. + - Bug item #2914995 "Image jpeg quality" was fixed. + - The signature of the Image() method was changed (check the documentation for the $resize parameter). + 4.8.018 (2009-12-15) - Bug item #2914352 "write error" was fixed. diff --git a/README.TXT b/README.TXT index b9870cf..ba944bb 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.8.018 -Release date: 2009-12-15 +Version: 4.8.019 +Release date: 2009-12-16 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 512961f..91d4b3a 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 9426804..a72a42c 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

method addExtGState [line 11391]

+

method addExtGState [line 11407]

@@ -6184,7 +6184,7 @@ $fontfile = ''])
-

method addHtmlLink [line 7760]

+

method addHtmlLink [line 7776]

@@ -6253,7 +6253,7 @@ $style = -1])
-

method addHTMLVertSpace [line 15002]

+

method addHTMLVertSpace [line 15018]

@@ -6319,7 +6319,7 @@ $closing = false])
-

method addJavascriptObject [line 10011]

+

method addJavascriptObject [line 10027]

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

method addTOC [line 16025]

+

method addTOC [line 16041]

@@ -6566,7 +6566,7 @@ $toc_name = 'TOC'])
-

method AliasNbPages [line 11199]

+

method AliasNbPages [line 11215]

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

method AliasNumPage [line 11226]

+

method AliasNumPage [line 11242]

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

method Arrow [line 9253]

+

method Arrow [line 9269]

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

method arrUTF8ToUTF16BE [line 7658]

+

method arrUTF8ToUTF16BE [line 7674]

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

method Bookmark [line 9897]

+

method Bookmark [line 9913]

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

method Button [line 10905]

+

method Button [line 10921]

@@ -7118,7 +7118,7 @@ $ignore_min_height = false])
-

method CheckBox [line 10835]

+

method CheckBox [line 10851]

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

method Circle [line 8887]

+

method Circle [line 8903]

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

method Clip [line 11654]

+

method Clip [line 11670]

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

method closeHTMLTagHandler [line 14650]

+

method closeHTMLTagHandler [line 14666]

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

method ComboBox [line 10774]

+

method ComboBox [line 10790]

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

method commitTransaction [line 16184]

+

method commitTransaction [line 16200]

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

method convertHTMLColorToDec [line 7793]

+

method convertHTMLColorToDec [line 7809]

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

method CoonsPatchMesh [line 11574]

+

method CoonsPatchMesh [line 11590]

@@ -7753,7 +7753,7 @@ $coords_max = 1])
-

method Curve [line 8662]

+

method Curve [line 8678]

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

method deletePage [line 15884]

+

method deletePage [line 15900]

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

method Ellipse [line 8783]

+

method Ellipse [line 8799]

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

method empty_string [line 16238]

+

method empty_string [line 16254]

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

method formatPageNumber [line 11303]

+

method formatPageNumber [line 11319]

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

method formatTOCPageNumber [line 11315]

+

method formatTOCPageNumber [line 11331]

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

method GetAbsX [line 5235]

+

method GetAbsX [line 5251]

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

method getAliasNbPages [line 11211]

+

method getAliasNbPages [line 11227]

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

method getAliasNumPage [line 11239]

+

method getAliasNumPage [line 11255]

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

method getAnnotOptFromJSProp [line 10142]

+

method getAnnotOptFromJSProp [line 10158]

@@ -8424,7 +8424,7 @@ $fontsize = 0])
-

method getBarcode [line 12125]

+

method getBarcode [line 12141]

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

method getBuffer [line 15570]

+

method getBuffer [line 15586]

@@ -8675,7 +8675,7 @@ $ignore_min_height = false])
-

method getCellHeightRatio [line 11477]

+

method getCellHeightRatio [line 11493]

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

method getFontBuffer [line 15730]

+

method getFontBuffer [line 15746]

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

method getFontFamily [line 12611]

+

method getFontFamily [line 12627]

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

method getFontSize [line 12591]

+

method getFontSize [line 12607]

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

method getFontSizePt [line 12601]

+

method getFontSizePt [line 12617]

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

method getFontStyle [line 12621]

+

method getFontStyle [line 12637]

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

method getFooterFont [line 7719]

+

method getFooterFont [line 7735]

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

method getFormDefaultProp [line 10517]

+

method getFormDefaultProp [line 10533]

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

method getGDgamma [line 5178]

+

method getGDgamma [line 5194]

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

method getGraphicVars [line 15438]

+

method getGraphicVars [line 15454]

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

method getGroupPageNo [line 11252]

+

method getGroupPageNo [line 11268]

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

method getGroupPageNoFormatted [line 11262]

+

method getGroupPageNoFormatted [line 11278]

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

method getHeaderFont [line 7699]

+

method getHeaderFont [line 7715]

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

method getHtmlDomArray [line 12657]

+

method getHtmlDomArray [line 12673]

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

method getHTMLUnitToUnits [line 15157]

+

method getHTMLUnitToUnits [line 15173]

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

method getImageBuffer [line 15672]

+

method getImageBuffer [line 15688]

@@ -9534,7 +9534,7 @@ $imgfile)
-

method GetLineWidth [line 8376]

+

method GetLineWidth [line 8392]

@@ -9568,7 +9568,7 @@ $imgfile)
-

method getMargins [line 12554]

+

method getMargins [line 12570]

@@ -9723,7 +9723,7 @@ $w = 0])
-

method getObjFilename [line 15502]

+

method getObjFilename [line 15518]

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

method getOriginalMargins [line 12577]

+

method getOriginalMargins [line 12593]

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

method getPageBuffer [line 15613]

+

method getPageBuffer [line 15629]

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

method getPageGroupAlias [line 11274]

+

method getPageGroupAlias [line 11290]

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

method getPageNumGroupAlias [line 11289]

+

method getPageNumGroupAlias [line 11305]

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

method getPDFData [line 7742]

+

method getPDFData [line 7758]

@@ -10244,7 +10244,7 @@ $fontsize = 0])
-

method GetX [line 5219]

+

method GetX [line 5235]

@@ -10275,7 +10275,7 @@ $fontsize = 0])
-

method GetY [line 5246]

+

method GetY [line 5262]

@@ -10306,7 +10306,7 @@ $fontsize = 0])
-

method get_mqr [line 4938]

+

method get_mqr [line 4954]

@@ -10337,7 +10337,7 @@ $fontsize = 0])
-

method Gradient [line 11677]

+

method Gradient [line 11693]

- + - + @@ -10554,7 +10554,7 @@ $hidden = false])
-

method ImageEps [line 11849]

+

method ImageEps [line 11865]

@@ -10435,7 +10435,7 @@ $w = 0], [float $h = 0], [string $type = ''], [mixed $link = ''], [string -$align = ''], [boolean +$align = ''], [mixed $resize = false], [int $dpi = 300], [string $palign = ''], [boolean @@ -10509,9 +10509,9 @@ $hidden = false]) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
boolean  mixed   $resize  If true resize (reduce) the image to fit $w and $h (requires GD library).If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
int  
@@ -10650,7 +10650,7 @@ $border = 0])
-

method ImagePngAlpha [line 5134]

+

method ImagePngAlpha [line 5150]

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

method IncludeJS [line 9998]

+

method IncludeJS [line 10014]

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

method intToRoman [line 15231]

+

method intToRoman [line 15247]

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

method Line [line 8529]

+

method Line [line 8545]

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

method LinearGradient [line 11534]

+

method LinearGradient [line 11550]

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

method ListBox [line 10714]

+

method ListBox [line 10730]

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

method Ln [line 5191]

+

method Ln [line 5207]

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

method MirrorH [line 8148]

+

method MirrorH [line 8164]

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

method MirrorL [line 8184]

+

method MirrorL [line 8200]

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

method MirrorP [line 8171]

+

method MirrorP [line 8187]

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

method MirrorV [line 8159]

+

method MirrorV [line 8175]

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

method movePage [line 15747]

+

method movePage [line 15763]

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

method objclone [line 16227]

+

method objclone [line 16243]

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

method openHTMLTagHandler [line 14105]

+

method openHTMLTagHandler [line 14121]

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

method Output [line 5338]

+

method Output [line 5354]

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

method PageNoFormatted [line 11325]

+

method PageNoFormatted [line 11341]

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

method PieSector [line 11771]

+

method PieSector [line 11787]

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

method pixelsToUnits [line 7850]

+

method pixelsToUnits [line 7866]

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

method Polycurve [line 8719]

+

method Polycurve [line 8735]

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

method Polygon [line 8939]

+

method Polygon [line 8955]

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

method PolyLine [line 8913]

+

method PolyLine [line 8929]

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

method putHtmlListBullet [line 15296]

+

method putHtmlListBullet [line 15312]

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

method RadialGradient [line 11552]

+

method RadialGradient [line 11568]

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

method RadioButton [line 10626]

+

method RadioButton [line 10642]

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

method readDiskCache [line 15542]

+

method readDiskCache [line 15558]

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

method Rect [line 8564]

+

method Rect [line 8580]

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

method RegularPolygon [line 9064]

+

method RegularPolygon [line 9080]

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

method rfread [line 5104]

+

method rfread [line 5120]

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

method rollbackTransaction [line 16198]

+

method rollbackTransaction [line 16214]

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

method Rotate [line 8243]

+

method Rotate [line 8259]

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

method RoundedRect [line 9168]

+

method RoundedRect [line 9184]

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

method Scale [line 8113]

+

method Scale [line 8129]

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

method ScaleX [line 8073]

+

method ScaleX [line 8089]

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

method ScaleXY [line 8099]

+

method ScaleXY [line 8115]

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

method ScaleY [line 8086]

+

method ScaleY [line 8102]

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

method setAlpha [line 11434]

+

method setAlpha [line 11450]

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

method setBarcode [line 12115]

+

method setBarcode [line 12131]

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

method SetBooklet [line 15071]

+

method SetBooklet [line 15087]

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

method setBuffer [line 15552]

+

method setBuffer [line 15568]

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

method setCellHeightRatio [line 11468]

+

method setCellHeightRatio [line 11484]

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

method setDefaultTableColumns [line 11458]

+

method setDefaultTableColumns [line 11474]

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

method setExtGState [line 11403]

+

method setExtGState [line 11419]

@@ -14119,7 +14119,7 @@ $fontfile = ''])
-

method setFontBuffer [line 15688]

+

method setFontBuffer [line 15704]

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

method setFontSubBuffer [line 15710]

+

method setFontSubBuffer [line 15726]

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

method setFooterFont [line 7709]

+

method setFooterFont [line 7725]

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

method setFormDefaultProp [line 10506]

+

method setFormDefaultProp [line 10522]

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

method setGraphicVars [line 15469]

+

method setGraphicVars [line 15485]

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

method setHeaderFont [line 7689]

+

method setHeaderFont [line 7705]

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

method setHtmlLinksStyle [line 15142]

+

method setHtmlLinksStyle [line 15158]

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

method setHtmlVSpace [line 15111]

+

method setHtmlVSpace [line 15127]

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

method setImageBuffer [line 15629]

+

method setImageBuffer [line 15645]

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

method setImageSubBuffer [line 15652]

+

method setImageSubBuffer [line 15668]

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

- Set image buffer content.



+ Set image buffer content for a specified sub-key.



Tags:

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

method setJPEGQuality [line 11445]

+

method setJPEGQuality [line 11461]

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

method setLanguageArray [line 7729]

+

method setLanguageArray [line 7745]

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

method SetLineStyle [line 8401]

+

method SetLineStyle [line 8417]

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

method SetLineWidth [line 8360]

+

method SetLineWidth [line 8376]

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

method setListIndentWidth [line 15121]

+

method setListIndentWidth [line 15137]

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

method setLIsymbol [line 15031]

+

method setLIsymbol [line 15047]

@@ -15289,7 +15289,7 @@ $right = -1])
-

method setOpenCell [line 15131]

+

method setOpenCell [line 15147]

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

method setPageBuffer [line 15586]

+

method setPageBuffer [line 15602]

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

method setPDFVersion [line 11487]

+

method setPDFVersion [line 11503]

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

method SetProtection [line 8013]

+

method SetProtection [line 8029]

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

method setSignature [line 11156]

+

method setSignature [line 11172]

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

method setUserRights [line 11126]

+

method setUserRights [line 11142]

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

method setViewerPreferences [line 11517]

+

method setViewerPreferences [line 11533]

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

method setVisibility [line 11355]

+

method setVisibility [line 11371]

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

method SetX [line 5259]

+

method SetX [line 5275]

@@ -16467,7 +16467,7 @@ $x)
-

method SetXY [line 5322]

+

method SetXY [line 5338]

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

method SetY [line 5291]

+

method SetY [line 5307]

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

method set_mqr [line 4923]

+

method set_mqr [line 4939]

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

method Skew [line 8303]

+

method Skew [line 8319]

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

method SkewX [line 8276]

+

method SkewX [line 8292]

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

method SkewY [line 8289]

+

method SkewY [line 8305]

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

method StarPolygon [line 9119]

+

method StarPolygon [line 9135]

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

method startPageGroup [line 11184]

+

method startPageGroup [line 11200]

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

method startTransaction [line 16168]

+

method startTransaction [line 16184]

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

method StartTransform [line 8041]

+

method StartTransform [line 8057]

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

method StopTransform [line 8056]

+

method StopTransform [line 8072]

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

method swapMargins [line 15087]

+

method swapMargins [line 15103]

@@ -17176,7 +17176,7 @@ $clip = false])
-

method TextField [line 10535]

+

method TextField [line 10551]

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

method Transform [line 8336]

+

method Transform [line 8352]

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

method Translate [line 8219]

+

method Translate [line 8235]

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

method TranslateX [line 8196]

+

method TranslateX [line 8212]

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

method TranslateY [line 8207]

+

method TranslateY [line 8223]

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

method unhtmlentities [line 7861]

+

method unhtmlentities [line 7877]

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

method utf8Bidi [line 9326]

+

method utf8Bidi [line 9342]

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

method UTF8StringToArray [line 7491]

+

method UTF8StringToArray [line 7507]

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

method utf8StrRev [line 9312]

+

method utf8StrRev [line 9328]

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

method UTF8ToLatin1 [line 7598]

+

method UTF8ToLatin1 [line 7614]

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

method UTF8ToUTF16BE [line 7582]

+

method UTF8ToUTF16BE [line 7598]

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

method write1DBarcode [line 12144]

+

method write1DBarcode [line 12160]

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

method write2DBarcode [line 12401]

+

method write2DBarcode [line 12417]

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

method writeBarcode [line 12351]

+

method writeBarcode [line 12367]

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

method writeDiskCache [line 15514]

+

method writeDiskCache [line 15530]

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

method writeHTML [line 13121]

+

method writeHTML [line 13137]

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

method writeHTMLCell [line 12645]

+

method writeHTMLCell [line 12661]

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

method _addfield [line 10107]

+

method _addfield [line 10123]

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

method _beginpage [line 7234]

+

method _beginpage [line 7250]

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

method _datastring [line 7370]

+

method _datastring [line 7386]

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

method _datestring [line 7383]

+

method _datestring [line 7399]

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

method _destroy [line 5494]

+

method _destroy [line 5510]

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

method _dochecks [line 5522]

+

method _dochecks [line 5538]

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

method _dolinethrough [line 7309]

+

method _dolinethrough [line 7325]

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

method _dolinethroughw [line 7336]

+

method _dolinethroughw [line 7352]

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

method _dounderline [line 7297]

+

method _dounderline [line 7313]

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

method _dounderlinew [line 7322]

+

method _dounderlinew [line 7338]

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

method _enddoc [line 7117]

+

method _enddoc [line 7133]

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

method _endpage [line 7273]

+

method _endpage [line 7289]

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

method _escape [line 7359]

+

method _escape [line 7375]

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

method _escapetext [line 7408]

+

method _escapetext [line 7424]

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

method _freadint [line 7348]

+

method _freadint [line 7364]

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

method _generateencryptionkey [line 7981]

+

method _generateencryptionkey [line 7997]

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

method _getfontpath [line 5538]

+

method _getfontpath [line 5554]

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

method _JScolor [line 10083]

+

method _JScolor [line 10099]

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

method _md5_16 [line 7942]

+

method _md5_16 [line 7958]

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

method _newobj [line 7283]

+

method _newobj [line 7299]

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

method _objectkey [line 7874]

+

method _objectkey [line 7890]

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

method _out [line 7439]

+

method _out [line 7455]

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

method _outarc [line 11751]

+

method _outarc [line 11767]

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

method _outCurve [line 8509]

+

method _outCurve [line 8525]

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

method _outLine [line 8473]

+

method _outLine [line 8489]

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

method _outPoint [line 8459]

+

method _outPoint [line 8475]

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

method _outRect [line 8490]

+

method _outRect [line 8506]

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

method _Ovalue [line 7955]

+

method _Ovalue [line 7971]

@@ -19735,7 +19735,7 @@ $owner_pass)
-

method _parsejpeg [line 4973]

+

method _parsejpeg [line 4989]

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

method _parsepng [line 4999]

+

method _parsepng [line 5015]

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

method _putannotsobjs [line 5721]

+

method _putannotsobjs [line 5737]

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

method _putannotsrefs [line 5690]

+

method _putannotsrefs [line 5706]

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

method _putAPXObject [line 6328]

+

method _putAPXObject [line 6344]

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

method _putbookmarks [line 9925]

+

method _putbookmarks [line 9941]

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

method _putcatalog [line 6942]

+

method _putcatalog [line 6958]

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

method _putcidfont0 [line 6679]

+

method _putcidfont0 [line 6695]

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

method _putencryption [line 7883]

+

method _putencryption [line 7899]

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

method _putextgstates [line 11413]

+

method _putextgstates [line 11429]

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

method _putfonts [line 6356]

+

method _putfonts [line 6372]

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

method _putfontwidths [line 6491]

+

method _putfontwidths [line 6507]

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

method _putheader [line 7109]

+

method _putheader [line 7125]

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

method _putimages [line 6744]

+

method _putimages [line 6760]

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

method _putinfo [line 6902]

+

method _putinfo [line 6918]

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

method _putjavascript [line 10023]

+

method _putjavascript [line 10039]

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

method _putocg [line 11334]

+

method _putocg [line 11350]

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

method _putpages [line 5549]

+

method _putpages [line 5565]

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

method _putresourcedict [line 6827]

+

method _putresourcedict [line 6843]

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

method _putresources [line 6868]

+

method _putresources [line 6884]

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

method _putshaders [line 11701]

+

method _putshaders [line 11717]

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

method _putsignature [line 11055]

+

method _putsignature [line 11071]

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

method _putspotcolors [line 6799]

+

method _putspotcolors [line 6815]

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

method _putstream [line 7425]

+

method _putstream [line 7441]

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

method _puttrailer [line 7095]

+

method _puttrailer [line 7111]

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

method _puttruetypeunicode [line 6590]

+

method _puttruetypeunicode [line 6606]

diff --git a/tcpdf.php b/tcpdf.php index dc77bda..1d7212c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-12-15 +// Last Update : 2009-12-16 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.018 +// Version : 4.8.019 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.8.018 + * @version 4.8.019 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.018 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.019 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 4.8.018 + * @version 4.8.019 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -4704,7 +4704,7 @@ if (!class_exists('TCPDF', false)) { * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension. * @param mixed $link URL or identifier returned by AddLink(). * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
- * @param boolean $resize If true resize (reduce) the image to fit $w and $h (requires GD library). + * @param mixed $resize If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling). * @param int $dpi dot-per-inch resolution used on resize * @param string $palign Allows to center or align the image on the current line. Possible values are:
  • L : left align
  • C : center
  • R : right align
  • '' : empty string : left for LTR or right for RTL
* @param boolean $ismask true if this image is a mask, false otherwise @@ -4756,11 +4756,26 @@ if (!class_exists('TCPDF', false)) { $neww = round($w * $this->k * $dpi / $this->dpi); $newh = round($h * $this->k * $dpi / $this->dpi); // check if resize is necessary (resize is used only to reduce the image) - if (($neww * $newh) >= ($pixw * $pixh)) { + $newsize = ($neww * $newh); + $pixsize = ($pixw * $pixh); + if (intval($resize) == 2) { + $resize = true; + } elseif ($newsize >= $pixsize) { $resize = false; } // check if image has been already added on document - if (!in_array($file, $this->imagekeys)) { + $newimage = true; + if (in_array($file, $this->imagekeys)) { + $newimage = false; + // get existing image data + $info = $this->getImageBuffer($file); + // check if the newer image is larger + $oldsize = ($info['w'] * $info['h']); + if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) { + $newimage = true; + } + } + if ($newimage) { //First use of image, get info if ($type == '') { $type = $this->getImageFileType($file); @@ -4817,14 +4832,15 @@ if (!class_exists('TCPDF', false)) { // force grayscale $info['cs'] = 'DeviceGray'; } - $info['i'] = $this->numimages + 1; + $info['i'] = $this->numimages; + if (!in_array($file, $this->imagekeys)) { + ++$info['i']; + } if ($imgmask !== false) { $info['masked'] = $imgmask; } // add image to document $this->setImageBuffer($file, $info); - } else { - $info = $this->getImageBuffer($file); } // Check whether we need a new page first as this does not fit $prev_x = $this->x; @@ -15637,12 +15653,12 @@ if (!class_exists('TCPDF', false)) { } if (!in_array($image, $this->imagekeys)) { $this->imagekeys[] = $image; + ++$this->numimages; } - ++$this->numimages; } /** - * Set image buffer content. + * Set image buffer content for a specified sub-key. * @param string $image image key * @param string $key image sub-key * @param array $data image data
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 5af5e2b..490c60d 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.3

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
@@ -20582,7 +20582,7 @@ $font)
-

method _putviewerpreferences [line 7025]

+

method _putviewerpreferences [line 7041]

diff --git a/doc/index.html b/doc/index.html index 5af5e2b..490c60d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.3

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index e310bd8..8fd6645 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Tue, 15 Dec 2009 19:00:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3
@@ -20613,7 +20613,7 @@ $font)
-

method _putxobjectdict [line 6816]

+

method _putxobjectdict [line 6832]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 8bf96b9..66e45f6 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1199,7 +1199,7 @@
setImageScale
in file tcpdf.php, method TCPDF::setImageScale()
    Set the adjusting factor to convert pixels to user units.
setImageSubBuffer
-
in file tcpdf.php, method TCPDF::setImageSubBuffer()
    Set image buffer content.
+
in file tcpdf.php, method TCPDF::setImageSubBuffer()
    Set image buffer content for a specified sub-key.
setJPEGQuality
in file tcpdf.php, method TCPDF::setJPEGQuality()
SetKeywords
@@ -1471,7 +1471,7 @@ top

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 9f1fbae..7af91ee 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1040,7 +1040,7 @@
setImageScale
in file tcpdf.php, method TCPDF::setImageScale()
    Set the adjusting factor to convert pixels to user units.
setImageSubBuffer
-
in file tcpdf.php, method TCPDF::setImageSubBuffer()
    Set image buffer content.
+
in file tcpdf.php, method TCPDF::setImageSubBuffer()
    Set image buffer content for a specified sub-key.
setJPEGQuality
in file tcpdf.php, method TCPDF::setJPEGQuality()
SetKeywords
@@ -1448,7 +1448,7 @@ top

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
@@ -20638,7 +20638,7 @@ $font)
-

method _RC4 [line 7902]

+

method _RC4 [line 7918]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 354f73c..d25f26a 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.




- Documentation generated on Tue, 15 Dec 2009 19:00:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3
@@ -20689,7 +20689,7 @@ $text)
-

method _textstring [line 7394]

+

method _textstring [line 7410]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index acccee4..c65b37a 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -104,7 +104,7 @@ unicode data

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index f51a2a2..f535368 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.




- Documentation generated on Tue, 15 Dec 2009 19:00:48 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3
@@ -20728,7 +20728,7 @@ $s)
-

method _toJPEG [line 4957]

+

method _toJPEG [line 4973]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index deb3ab2..6850f9d 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -507,7 +507,7 @@ Configuration file for TCPDF.




- Documentation generated on Tue, 15 Dec 2009 19:00:53 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:57 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 862eb28..0e9eabe 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
@@ -20770,7 +20770,7 @@ $file)
-

method _Uvalue [line 7968]

+

method _Uvalue [line 7984]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index c3a462c..aab1b60 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)

- Documentation generated on Tue, 15 Dec 2009 19:00:47 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:51 +0100 by phpDocumentor 1.4.3
@@ -20807,7 +20807,7 @@ $file)

- Documentation generated on Tue, 15 Dec 2009 19:00:48 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  4.8.018version:  4.8.019
copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- PDF_PRODUCER = 'TCPDF 4.8.018 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.019 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data


- Documentation generated on Tue, 15 Dec 2009 19:00:48 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 16 Dec 2009 21:17:52 +0100 by phpDocumentor 1.4.3