diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 99a2674..ff09723 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,9 @@ +4.6.002 (2009-04-20) + - Documentation of rollbackTransaction() method was fixed. + - The setImageScale() and getImageScale() methods now set and get the adjusting parameter used by pixelsToUnits() method. + - HTML images now support other units of measure than pixels (getHTMLUnitToUnits() is now used instead of pixelsToUnits()). + - WARNING: PDF_IMAGE_SCALE_RATIO has been changed by default to 1. + 4.6.001 (2009-04-17) - Spaces between HTML block tags are now automatically removed. - The bug related to cMargin changes between tables was fixed. diff --git a/README.TXT b/README.TXT index 427073f..aff10e3 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.6.001 -Release date: 2009-04-17 +Version: 4.6.002 +Release date: 2009-04-20 Author: Nicola Asuni Copyright (c) 2001-2009: @@ -38,7 +38,7 @@ Main Features: // * includes methods to publish some XHTML code; // * includes graphic (geometric) and transformation methods; // * includes Javascript and forms support; -// * includes a method to print various barcode formats; +// * includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS; // * includes methods to set Bookmarks and print a Table of Content; // * includes a method to move pages; // * includes methods for automatic page header and footer management; @@ -50,8 +50,7 @@ Main Features: // * supports clipping masks; // * supports Grayscale, RGB, CMYK, Spot Colors and Transparencies; // * supports several annotations, including links, text and file attachments; -// * supports page compression (requires zlib extension); -// * supports user rights management so Adobe Reader users can save filled-in copies of forms they complete. +// * supports page compression (requires zlib extension); // * supports text hyphenation. // * supports transactions to UNDO commands. diff --git a/config/tcpdf_config.php b/config/tcpdf_config.php index 28d40db..ee66d75 100755 --- a/config/tcpdf_config.php +++ b/config/tcpdf_config.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2009-03-18 +// Last Update : 2009-04-20 // // Description : Configuration file for TCPDF. // @@ -201,9 +201,9 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { define ('PDF_FONT_MONOSPACED', 'courier'); /** - * Ratio used to scale the images + * ratio used to adjust the conversion of pixels to user units */ - define ('PDF_IMAGE_SCALE_RATIO', 4); + define ('PDF_IMAGE_SCALE_RATIO', 1); /** * magnification factor for titles diff --git a/config/tcpdf_config_alt.php b/config/tcpdf_config_alt.php index fb86d9b..c5c4335 100755 --- a/config/tcpdf_config_alt.php +++ b/config/tcpdf_config_alt.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2009-03-18 +// Last Update : 2009-04-20 // // Description : Alternative configuration file for TCPDF. // @@ -197,9 +197,9 @@ define ('PDF_FONT_SIZE_DATA', 8); define ('PDF_FONT_MONOSPACED', 'courier'); /** - * Ratio used to scale the images + * ratio used to adjust the conversion of pixels to user units */ -define ('PDF_IMAGE_SCALE_RATIO', 4); +define ('PDF_IMAGE_SCALE_RATIO', 1); /** * magnification factor for titles diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index a12a42d..b189dfd 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index c178add..3da6136 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -581,7 +581,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.001 + version:  4.6.002 link:  http://www.tcpdf.org @@ -2560,7 +2560,7 @@ This is a PHP class for generating PDF documents without requiring external exte
- + @@ -2579,7 +2579,7 @@ This is a PHP class for generating PDF documents without requiring external exte
var:  scale factorvar:  factor to convert pixels to user units.
author:  Nicola Asuni
- +
Type:  imageadjusting


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

method addExtGState [line 9358]

+

method addExtGState [line 9359]

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

method addHTMLVertSpace [line 12469]

+

method addHTMLVertSpace [line 12476]

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

method addTOC [line 13351]

+

method addTOC [line 13358]

@@ -5662,7 +5662,7 @@ $filler = '.'])
-

method AliasNbPages [line 9166]

+

method AliasNbPages [line 9167]

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

method AliasNumPage [line 9193]

+

method AliasNumPage [line 9194]

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

method Bookmark [line 8769]

+

method Bookmark [line 8770]

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

method Button [line 9051]

+

method Button [line 9052]

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

method CheckBox [line 9031]

+

method CheckBox [line 9032]

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

method Circle [line 7875]

+

method Circle [line 7876]

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

method Clip [line 9621]

+

method Clip [line 9622]

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

method closeHTMLTagHandler [line 12145]

+

method closeHTMLTagHandler [line 12152]

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

method ComboBox [line 9012]

+

method ComboBox [line 9013]

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

method commitTransaction [line 13508]

+

method commitTransaction [line 13515]

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

- Delete the copy of the current TCPDF object



+ Delete the copy of the current TCPDF object used for undo operation.



Tags:

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

method CoonsPatchMesh [line 9541]

+

method CoonsPatchMesh [line 9542]

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

method Curve [line 7650]

+

method Curve [line 7651]

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

method Ellipse [line 7771]

+

method Ellipse [line 7772]

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

method empty_string [line 13554]

+

method empty_string [line 13561]

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

method formatPageNumber [line 9270]

+

method formatPageNumber [line 9271]

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

method formatTOCPageNumber [line 9282]

+

method formatTOCPageNumber [line 9283]

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

method getAliasNbPages [line 9178]

+

method getAliasNbPages [line 9179]

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

method getAliasNumPage [line 9206]

+

method getAliasNumPage [line 9207]

@@ -7280,7 +7280,7 @@ $arr)
-

method getBarcode [line 10089]

+

method getBarcode [line 10090]

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

method getBuffer [line 13034]

+

method getBuffer [line 13041]

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

method getCellHeightRatio [line 9444]

+

method getCellHeightRatio [line 9445]

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

method getFontBuffer [line 13194]

+

method getFontBuffer [line 13201]

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

method getFontFamily [line 10565]

+

method getFontFamily [line 10566]

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

method getFontSize [line 10545]

+

method getFontSize [line 10546]

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

method getFontSizePt [line 10555]

+

method getFontSizePt [line 10556]

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

method getFontStyle [line 10575]

+

method getFontStyle [line 10576]

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

method getGraphicVars [line 12902]

+

method getGraphicVars [line 12909]

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

method getGroupPageNo [line 9219]

+

method getGroupPageNo [line 9220]

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

method getGroupPageNoFormatted [line 9229]

+

method getGroupPageNoFormatted [line 9230]

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

method getHtmlDomArray [line 10611]

+

method getHtmlDomArray [line 10612]

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

method getHTMLUnitToUnits [line 12624]

+

method getHTMLUnitToUnits [line 12631]

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

method getImageBuffer [line 13136]

+

method getImageBuffer [line 13143]

@@ -8267,12 +8267,12 @@ $image)

- Returns the image scale.



+ Returns the adjusting factor to convert pixels to user units.



Tags:

- + @@ -8323,7 +8323,7 @@ $image)
-

method GetLineWidth [line 7367]

+

method GetLineWidth [line 7368]

return:  image scale.return:  adjusting factor to convert pixels to user units.
author:  Nicola Asuni
@@ -8357,7 +8357,7 @@ $image)
-

method getMargins [line 10508]

+

method getMargins [line 10509]

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

method getObjFilename [line 12966]

+

method getObjFilename [line 12973]

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

method getOriginalMargins [line 10531]

+

method getOriginalMargins [line 10532]

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

method getPageBuffer [line 13077]

+

method getPageBuffer [line 13084]

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

method getPageGroupAlias [line 9241]

+

method getPageGroupAlias [line 9242]

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

method getPageNumGroupAlias [line 9256]

+

method getPageNumGroupAlias [line 9257]

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

method Gradient [line 9644]

+

method Gradient [line 9645]

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

method ImageEps [line 9816]

+

method ImageEps [line 9817]

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

method IncludeJS [line 8861]

+

method IncludeJS [line 8862]

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

method intToRoman [line 12695]

+

method intToRoman [line 12702]

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

method Line [line 7517]

+

method Line [line 7518]

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

method LinearGradient [line 9501]

+

method LinearGradient [line 9502]

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

method ListBox [line 8989]

+

method ListBox [line 8990]

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

method MirrorH [line 7141]

+

method MirrorH [line 7142]

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

method MirrorL [line 7177]

+

method MirrorL [line 7178]

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

method MirrorP [line 7164]

+

method MirrorP [line 7165]

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

method MirrorV [line 7152]

+

method MirrorV [line 7153]

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

method movePage [line 13212]

+

method movePage [line 13219]

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

method objclone [line 13543]

+

method objclone [line 13550]

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

method openHTMLTagHandler [line 11827]

+

method openHTMLTagHandler [line 11828]

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

method PageNoFormatted [line 9292]

+

method PageNoFormatted [line 9293]

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

method PieSector [line 9738]

+

method PieSector [line 9739]

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

method pixelsToUnits [line 6846]

+

method pixelsToUnits [line 6847]

+ + + @@ -10686,7 +10689,7 @@ $px)
-

method Polycurve [line 7707]

+

method Polycurve [line 7708]

@@ -10664,6 +10664,9 @@ $px)
return:  value in user's unit
see:  TCPDF::setImageScale(), TCPDF::getImageScale()
access:  public
@@ -10758,7 +10761,7 @@ $fill_color = array()])
-

method Polygon [line 7900]

+

method Polygon [line 7901]

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

method putHtmlListBullet [line 12760]

+

method putHtmlListBullet [line 12767]

@@ -10866,7 +10869,7 @@ $size = 10])
-

method RadialGradient [line 9519]

+

method RadialGradient [line 9520]

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

method RadioButton [line 8971]

+

method RadioButton [line 8972]

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

method readDiskCache [line 13006]

+

method readDiskCache [line 13013]

@@ -11040,7 +11043,7 @@ $file)
-

method Rect [line 7552]

+

method Rect [line 7553]

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

method RegularPolygon [line 7999]

+

method RegularPolygon [line 8000]

@@ -11322,20 +11325,22 @@ $length)
-

method rollbackTransaction [line 13521]

+

method rollbackTransaction [line 13528]

- void rollbackTransaction( -string -$action) + TCPDF rollbackTransaction( +)

- This method allows to encapsulate some TCPDF commands to be later commited or deleted.



+ This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().



Tags:

+ + + @@ -11347,21 +11352,11 @@ $action)

-

Parameters:

-
-
return:  object.
since:  4.5.029 (2009-03-19)
- - - - - -
string  $action  the action to be taken. Legal values are 'start' = starts a new transaction; 'commit' = commit the latest transaction; 'rollback' = undo the latest transaction.
-

[ Top ]
-

method Rotate [line 7236]

+

method Rotate [line 7237]

@@ -11415,7 +11410,7 @@ $y = ''])
-

method RoundedRect [line 8103]

+

method RoundedRect [line 8104]

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

method Scale [line 7106]

+

method Scale [line 7107]

@@ -11562,7 +11557,7 @@ $y = ''])
-

method ScaleX [line 7066]

+

method ScaleX [line 7067]

@@ -11616,7 +11611,7 @@ $y = ''])
-

method ScaleXY [line 7092]

+

method ScaleXY [line 7093]

@@ -11670,7 +11665,7 @@ $y = ''])
-

method ScaleY [line 7079]

+

method ScaleY [line 7080]

@@ -11724,7 +11719,7 @@ $y = ''])
-

method setAlpha [line 9401]

+

method setAlpha [line 9402]

@@ -11856,7 +11851,7 @@ $margin = 0])
-

method setBarcode [line 10079]

+

method setBarcode [line 10080]

@@ -11892,7 +11887,7 @@ $bc = ''])
-

method SetBooklet [line 12538]

+

method SetBooklet [line 12545]

@@ -11943,7 +11938,7 @@ $outer = -1])
-

method setBuffer [line 13016]

+

method setBuffer [line 13023]

@@ -11982,7 +11977,7 @@ $data)
-

method setCellHeightRatio [line 9435]

+

method setCellHeightRatio [line 9436]

@@ -12180,7 +12175,7 @@ $font)
-

method setDefaultTableColumns [line 9425]

+

method setDefaultTableColumns [line 9426]

@@ -12417,7 +12412,7 @@ $tint = 100])
-

method setExtGState [line 9370]

+

method setExtGState [line 9371]

@@ -12663,7 +12658,7 @@ $fontfile = ''])
-

method setFontBuffer [line 13152]

+

method setFontBuffer [line 13159]

@@ -12750,7 +12745,7 @@ $size)
-

method setFontSubBuffer [line 13174]

+

method setFontSubBuffer [line 13181]

@@ -12904,7 +12899,7 @@ $fm = 10])
-

method setGraphicVars [line 12933]

+

method setGraphicVars [line 12940]

@@ -13100,7 +13095,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 12609]

+

method setHtmlLinksStyle [line 12616]

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

method setHtmlVSpace [line 12578]

+

method setHtmlVSpace [line 12585]

@@ -13184,7 +13179,7 @@ $tagvs)
-

method setImageBuffer [line 13093]

+

method setImageBuffer [line 13100]

@@ -13239,7 +13234,7 @@ $scale)

- Set the image scale.



+ Set the adjusting factor to convert pixels to user units.



Tags:

@@ -13263,7 +13258,7 @@ $scale) - +
float   $scale  image scale.adjusting factor to convert pixels to user units.

@@ -13271,7 +13266,7 @@ $scale)
-

method setImageSubBuffer [line 13116]

+

method setImageSubBuffer [line 13123]

@@ -13322,7 +13317,7 @@ $data)
-

method setJPEGQuality [line 9412]

+

method setJPEGQuality [line 9413]

@@ -13523,7 +13518,7 @@ $margin)
-

method SetLineStyle [line 7392]

+

method SetLineStyle [line 7393]

@@ -13569,7 +13564,7 @@ $style)
-

method SetLineWidth [line 7353]

+

method SetLineWidth [line 7354]

@@ -13665,7 +13660,7 @@ $page = -1])
-

method setListIndentWidth [line 12588]

+

method setListIndentWidth [line 12595]

@@ -13704,7 +13699,7 @@ $width)
-

method setLIsymbol [line 12498]

+

method setLIsymbol [line 12505]

@@ -13797,7 +13792,7 @@ $right = -1])
-

method setOpenCell [line 12598]

+

method setOpenCell [line 12605]

@@ -13884,7 +13879,7 @@ $resetmargins = false])
-

method setPageBuffer [line 13050]

+

method setPageBuffer [line 13057]

@@ -14098,7 +14093,7 @@ $unit)
-

method setPDFVersion [line 9454]

+

method setPDFVersion [line 9455]

@@ -14212,7 +14207,7 @@ $val = true])
-

method SetProtection [line 7009]

+

method SetProtection [line 7010]

@@ -14690,7 +14685,7 @@ $margin)
-

method setUserRights [line 9131]

+

method setUserRights [line 9132]

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

method setViewerPreferences [line 9484]

+

method setViewerPreferences [line 9485]

@@ -14786,7 +14781,7 @@ $preferences)
-

method setVisibility [line 9322]

+

method setVisibility [line 9323]

@@ -14960,7 +14955,7 @@ $resetx = true])
-

method Skew [line 7296]

+

method Skew [line 7297]

@@ -15020,7 +15015,7 @@ $y = ''])
-

method SkewX [line 7269]

+

method SkewX [line 7270]

@@ -15074,7 +15069,7 @@ $y = ''])
-

method SkewY [line 7282]

+

method SkewY [line 7283]

@@ -15128,7 +15123,7 @@ $y = ''])
-

method StarPolygon [line 8054]

+

method StarPolygon [line 8055]

@@ -15300,7 +15295,7 @@ $format = ''])
-

method startPageGroup [line 9151]

+

method startPageGroup [line 9152]

@@ -15336,7 +15331,7 @@ $page = ''])
-

method startTransaction [line 13494]

+

method startTransaction [line 13501]

@@ -15345,7 +15340,7 @@ $page = ''])

- Stores a copy of the current TCPDF object.



+ Stores a copy of the current TCPDF object used for undo operation.



Tags:

@@ -15364,7 +15359,7 @@ $page = ''])
-

method StartTransform [line 7037]

+

method StartTransform [line 7038]

@@ -15395,7 +15390,7 @@ $page = ''])
-

method StopTransform [line 7050]

+

method StopTransform [line 7051]

@@ -15426,7 +15421,7 @@ $page = ''])
-

method swapMargins [line 12554]

+

method swapMargins [line 12561]

@@ -15534,7 +15529,7 @@ $clip = false])
-

method TextField [line 8958]

+

method TextField [line 8959]

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

method Transform [line 7329]

+

method Transform [line 7330]

@@ -15630,7 +15625,7 @@ $tm)
-

method Translate [line 7212]

+

method Translate [line 7213]

@@ -15678,7 +15673,7 @@ $t_y)
-

method TranslateX [line 7189]

+

method TranslateX [line 7190]

@@ -15720,7 +15715,7 @@ $t_x)
-

method TranslateY [line 7200]

+

method TranslateY [line 7201]

@@ -15762,7 +15757,7 @@ $t_y)
-

method unhtmlentities [line 6857]

+

method unhtmlentities [line 6858]

@@ -15993,7 +15988,7 @@ $end = ''])
-

method utf8Bidi [line 8202]

+

method utf8Bidi [line 8203]

@@ -16113,7 +16108,7 @@ $str)
-

method utf8StrRev [line 8188]

+

method utf8StrRev [line 8189]

@@ -16356,7 +16351,7 @@ $maxh = 0])
-

method write1DBarcode [line 10108]

+

method write1DBarcode [line 10109]

@@ -16446,7 +16441,7 @@ $align = ''])
-

method write2DBarcode [line 10361]

+

method write2DBarcode [line 10362]

@@ -16530,7 +16525,7 @@ $align = ''])
-

method writeBarcode [line 10311]

+

method writeBarcode [line 10312]

@@ -16620,7 +16615,7 @@ $code)
-

method writeDiskCache [line 12978]

+

method writeDiskCache [line 12985]

@@ -16677,7 +16672,7 @@ $file)
-

method writeHTML [line 11007]

+

method writeHTML [line 11008]

@@ -16743,7 +16738,7 @@ $align = ''])
-

method writeHTMLCell [line 10599]

+

method writeHTMLCell [line 10600]

@@ -16845,7 +16840,7 @@ $autopadding = true])
-

method _addfield [line 8923]

+

method _addfield [line 8924]

@@ -17331,7 +17326,7 @@ $f)
-

method _generateencryptionkey [line 6977]

+

method _generateencryptionkey [line 6978]

@@ -17410,7 +17405,7 @@ $protection)
-

method _JScolor [line 8899]

+

method _JScolor [line 8900]

@@ -17446,7 +17441,7 @@ $color)
-

method _md5_16 [line 6938]

+

method _md5_16 [line 6939]

@@ -17516,7 +17511,7 @@ $str)
-

method _objectkey [line 6870]

+

method _objectkey [line 6871]

@@ -17591,7 +17586,7 @@ $s)
-

method _outarc [line 9718]

+

method _outarc [line 9719]

@@ -17663,7 +17658,7 @@ $y3)
-

method _outCurve [line 7497]

+

method _outCurve [line 7498]

@@ -17729,7 +17724,7 @@ $y3)
-

method _outLine [line 7461]

+

method _outLine [line 7462]

@@ -17771,7 +17766,7 @@ $y)
-

method _outPoint [line 7447]

+

method _outPoint [line 7448]

@@ -17813,7 +17808,7 @@ $y)
-

method _outRect [line 7478]

+

method _outRect [line 7479]

@@ -17876,7 +17871,7 @@ $op)
-

method _Ovalue [line 6951]

+

method _Ovalue [line 6952]

@@ -18047,7 +18042,7 @@ $n)
-

method _putbookmarks [line 8797]

+

method _putbookmarks [line 8798]

@@ -18170,7 +18165,7 @@ $font)
-

method _putencryption [line 6879]

+

method _putencryption [line 6880]

diff --git a/tcpdf.php b/tcpdf.php index 8b321e1..98bd6a2 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-04-17 +// Last Update : 2009-04-20 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.001 +// Version : 4.6.002 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -122,7 +122,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.6.001 + * @version 4.6.002 */ /** @@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.001 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.002 (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.6.001 + * @version 4.6.002 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -524,7 +524,7 @@ if (!class_exists('TCPDF', false)) { protected $img_rb_y; /** - * @var image scale factor + * @var adjusting factor to convert pixels to user units. * @since 2004-06-14 * @author Nicola Asuni * @access protected @@ -1612,8 +1612,8 @@ if (!class_exists('TCPDF', false)) { } /** - * Set the image scale. - * @param float $scale image scale. + * Set the adjusting factor to convert pixels to user units. + * @param float $scale adjusting factor to convert pixels to user units. * @author Nicola Asuni * @access public * @since 1.5.2 @@ -1623,8 +1623,8 @@ if (!class_exists('TCPDF', false)) { } /** - * Returns the image scale. - * @return float image scale. + * Returns the adjusting factor to convert pixels to user units. + * @return float adjusting factor to convert pixels to user units. * @author Nicola Asuni * @access public * @since 1.5.2 @@ -4330,8 +4330,8 @@ if (!class_exists('TCPDF', false)) { // calculate image width and height on document if (($w <= 0) AND ($h <= 0)) { // convert image size to document unit - $w = $pixw / ($this->imgscale * $this->k); - $h = $pixh / ($this->imgscale * $this->k); + $w = $this->pixelsToUnits($pixw); + $h = $this->pixelsToUnits($pixh); } elseif ($w <= 0) { $w = $h * $pixw / $pixh; } elseif ($h <= 0) { @@ -6841,10 +6841,11 @@ if (!class_exists('TCPDF', false)) { * Converts pixels to User's Units. * @param int $px pixels * @return float value in user's unit - * @access public + * @access public + * @see setImageScale(), getImageScale() */ public function pixelsToUnits($px) { - return ($px / $this->k); + return ($px / ($this->imgscale * $this->k)); } /** @@ -11975,11 +11976,17 @@ if (!class_exists('TCPDF', false)) { if (isset($tag['attribute']['border']) AND !empty($tag['attribute']['border'])) { // currently only support 1 (frame) or a combination of 'LTRB' $border = $tag['attribute']['border']; + } + if (isset($tag['attribute']['width'])) { + $iw = $this->getHTMLUnitToUnits($tag['attribute']['width'], 1, 'px', false); + } + if (isset($tag['attribute']['height'])) { + $ih = $this->getHTMLUnitToUnits($tag['attribute']['height'], 1, 'px', false); } if (($type == 'eps') OR ($type == 'ai')) { - $this->ImageEps($tag['attribute']['src'], $xpos, $this->GetY(), $this->pixelsToUnits($tag['attribute']['width']), $this->pixelsToUnits($tag['attribute']['height']), $imglink, true, $align, '', $border); + $this->ImageEps($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, $imglink, true, $align, '', $border); } else { - $this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $this->pixelsToUnits($tag['attribute']['width']), $this->pixelsToUnits($tag['attribute']['height']), '', $imglink, $align, false, 300, '', false, false, $border); + $this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border); } switch($align) { case 'T': { @@ -12678,7 +12685,7 @@ if (!class_exists('TCPDF', false)) { } case 'px': case 'pt': { - $retval = $value / $k; + $retval = $this->pixelsToUnits($value); break; } } @@ -13487,7 +13494,7 @@ if (!class_exists('TCPDF', false)) { } /** - * Stores a copy of the current TCPDF object. + * Stores a copy of the current TCPDF object used for undo operation. * @access public * @since 4.5.029 (2009-03-19) */ @@ -13501,7 +13508,7 @@ if (!class_exists('TCPDF', false)) { } /** - * Delete the copy of the current TCPDF object + * Delete the copy of the current TCPDF object used for undo operation. * @access public * @since 4.5.029 (2009-03-19) */ @@ -13513,8 +13520,8 @@ if (!class_exists('TCPDF', false)) { } /** - * This method allows to encapsulate some TCPDF commands to be later commited or deleted. - * @param string $action the action to be taken. Legal values are 'start' = starts a new transaction; 'commit' = commit the latest transaction; 'rollback' = undo the latest transaction. + * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction(). + * @return TCPDF object. * @access public * @since 4.5.029 (2009-03-19) */
@@ -18198,7 +18193,7 @@ $font)
-

method _putextgstates [line 9380]

+

method _putextgstates [line 9381]

diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index ddacc87..0b16b65 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.1
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
diff --git a/doc/index.html b/doc/index.html index ddacc87..0b16b65 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
@@ -18371,7 +18366,7 @@ $cidoffset = 0])
-

method _putjavascript [line 8871]

+

method _putjavascript [line 8872]

diff --git a/doc/errors.html b/doc/errors.html index bedc833..f876f10 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by phpDocumentor 1.4.1
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 0e4dffb..801fb15 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -365,7 +365,7 @@
ComboBox
in file tcpdf.php, method TCPDF::ComboBox()
commitTransaction
-
in file tcpdf.php, method TCPDF::commitTransaction()
    Delete the copy of the current TCPDF object
+
in file tcpdf.php, method TCPDF::commitTransaction()
    Delete the copy of the current TCPDF object used for undo operation.
convertHTMLColorToDec
in file tcpdf.php, method TCPDF::convertHTMLColorToDec()
    Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).
CoonsPatchMesh
@@ -555,7 +555,7 @@
getImageRBY
in file tcpdf.php, method TCPDF::getImageRBY()
    Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image
getImageScale
-
in file tcpdf.php, method TCPDF::getImageScale()
    Returns the image scale.
+
in file tcpdf.php, method TCPDF::getImageScale()
    Returns the adjusting factor to convert pixels to user units.
getLastH
in file tcpdf.php, method TCPDF::getLastH()
    Get the last cell height.
GetLineWidth
@@ -951,7 +951,7 @@
PDF_HEADER_TITLE
in file tcpdf_config.php, constant PDF_HEADER_TITLE
    header title
PDF_IMAGE_SCALE_RATIO
-
in file tcpdf_config.php, constant PDF_IMAGE_SCALE_RATIO
    Ratio used to scale the images
+
in file tcpdf_config.php, constant PDF_IMAGE_SCALE_RATIO
    ratio used to adjust the conversion of pixels to user units
PDF_MARGIN_BOTTOM
in file tcpdf_config.php, constant PDF_MARGIN_BOTTOM
    bottom margin
PDF_MARGIN_FOOTER
@@ -1009,7 +1009,7 @@
rfread
in file tcpdf.php, method TCPDF::rfread()
    Binary-safe and URL-safe file read.
rollbackTransaction
-
in file tcpdf.php, method TCPDF::rollbackTransaction()
    This method allows to encapsulate some TCPDF commands to be later commited or deleted.
+
in file tcpdf.php, method TCPDF::rollbackTransaction()
    This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
Rotate
in file tcpdf.php, method TCPDF::Rotate()
    Rotate object.
RoundedRect
@@ -1109,7 +1109,7 @@
setImageBuffer
in file tcpdf.php, method TCPDF::setImageBuffer()
    Set image buffer content.
setImageScale
-
in file tcpdf.php, method TCPDF::setImageScale()
    Set the image scale.
+
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.
setJPEGQuality
@@ -1201,7 +1201,7 @@
startPageGroup
in file tcpdf.php, method TCPDF::startPageGroup()
startTransaction
-
in file tcpdf.php, method TCPDF::startTransaction()
    Stores a copy of the current TCPDF object.
+
in file tcpdf.php, method TCPDF::startTransaction()
    Stores a copy of the current TCPDF object used for undo operation.
StartTransform
in file tcpdf.php, method TCPDF::StartTransform()
    Starts a 2D tranformation saving current graphic state.
StopTransform
@@ -1373,7 +1373,7 @@ top
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:30 +0200 by phpDocumentor 1.4.1
@@ -18396,7 +18391,7 @@ $cidoffset = 0])
-

method _putocg [line 9301]

+

method _putocg [line 9302]

diff --git a/doc/elementindex.html b/doc/elementindex.html index 8858da3..e90588c 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -216,7 +216,7 @@
ComboBox
in file tcpdf.php, method TCPDF::ComboBox()
commitTransaction
-
in file tcpdf.php, method TCPDF::commitTransaction()
    Delete the copy of the current TCPDF object
+
in file tcpdf.php, method TCPDF::commitTransaction()
    Delete the copy of the current TCPDF object used for undo operation.
convertHTMLColorToDec
in file tcpdf.php, method TCPDF::convertHTMLColorToDec()
    Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).
CoonsPatchMesh
@@ -406,7 +406,7 @@
getImageRBY
in file tcpdf.php, method TCPDF::getImageRBY()
    Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image
getImageScale
-
in file tcpdf.php, method TCPDF::getImageScale()
    Returns the image scale.
+
in file tcpdf.php, method TCPDF::getImageScale()
    Returns the adjusting factor to convert pixels to user units.
getLastH
in file tcpdf.php, method TCPDF::getLastH()
    Get the last cell height.
GetLineWidth
@@ -802,7 +802,7 @@
PDF_HEADER_TITLE
in file tcpdf_config.php, constant PDF_HEADER_TITLE
    header title
PDF_IMAGE_SCALE_RATIO
-
in file tcpdf_config.php, constant PDF_IMAGE_SCALE_RATIO
    Ratio used to scale the images
+
in file tcpdf_config.php, constant PDF_IMAGE_SCALE_RATIO
    ratio used to adjust the conversion of pixels to user units
PDF_MARGIN_BOTTOM
in file tcpdf_config.php, constant PDF_MARGIN_BOTTOM
    bottom margin
PDF_MARGIN_FOOTER
@@ -860,7 +860,7 @@
rfread
in file tcpdf.php, method TCPDF::rfread()
    Binary-safe and URL-safe file read.
rollbackTransaction
-
in file tcpdf.php, method TCPDF::rollbackTransaction()
    This method allows to encapsulate some TCPDF commands to be later commited or deleted.
+
in file tcpdf.php, method TCPDF::rollbackTransaction()
    This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
Rotate
in file tcpdf.php, method TCPDF::Rotate()
    Rotate object.
RoundedRect
@@ -960,7 +960,7 @@
setImageBuffer
in file tcpdf.php, method TCPDF::setImageBuffer()
    Set image buffer content.
setImageScale
-
in file tcpdf.php, method TCPDF::setImageScale()
    Set the image scale.
+
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.
setJPEGQuality
@@ -1052,7 +1052,7 @@
startPageGroup
in file tcpdf.php, method TCPDF::startPageGroup()
startTransaction
-
in file tcpdf.php, method TCPDF::startTransaction()
    Stores a copy of the current TCPDF object.
+
in file tcpdf.php, method TCPDF::startTransaction()
    Stores a copy of the current TCPDF object used for undo operation.
StartTransform
in file tcpdf.php, method TCPDF::StartTransform()
    Starts a 2D tranformation saving current graphic state.
StopTransform
@@ -1350,7 +1350,7 @@ top
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 4b34377..e216ce5 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 Fri, 17 Apr 2009 16:18:19 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by phpDocumentor 1.4.1
@@ -18496,7 +18491,7 @@ $cidoffset = 0])
-

method _putshaders [line 9668]

+

method _putshaders [line 9669]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 64d455c..70f3b29 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

@@ -18658,7 +18653,7 @@ $font)
-

method _putuserrights [line 9075]

+

method _putuserrights [line 9076]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index b848eb4..10a37b0 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 Fri, 17 Apr 2009 16:18:14 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
@@ -18739,7 +18734,7 @@ $font)
-

method _RC4 [line 6898]

+

method _RC4 [line 6899]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index cd33c1f..1da433d 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -379,11 +379,11 @@ Configuration file for TCPDF.



diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 3844753..b6d154b 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 Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
@@ -18871,7 +18866,7 @@ $file)
-

method _Uvalue [line 6964]

+

method _Uvalue [line 6965]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index fc35f40..aff7598 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Fri, 17 Apr 2009 16:18:13 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
@@ -18908,7 +18903,7 @@ $file)
- Documentation generated on Fri, 17 Apr 2009 16:18:14 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1
- PDF_IMAGE_SCALE_RATIO = 4 + PDF_IMAGE_SCALE_RATIO = 1
- Ratio used to scale the images


+ ratio used to adjust the conversion of pixels to user units


[ Top ]


@@ -507,7 +507,7 @@ Configuration file for TCPDF.



- Documentation generated on Fri, 17 Apr 2009 16:18:19 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:37 +0200 by phpDocumentor 1.4.1
author:  Nicola Asuni
version:  4.6.001version:  4.6.002
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.6.001 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.002 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Fri, 17 Apr 2009 16:18:14 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 20 Apr 2009 18:18:31 +0200 by phpDocumentor 1.4.1