updated to FPDF 1.6
This commit is contained in:
parent
12adfa992f
commit
757c4b5762
|
@ -41,9 +41,14 @@ The complete license can be found in the file COPYING.
|
|||
|
||||
Some parts of this package have other, compatible licences. These are:
|
||||
|
||||
A: Freeware
|
||||
A:
|
||||
|
||||
You may use, modify and redistribute this software as you wish.
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software to use, copy, modify, distribute, sublicense, and/or sell
|
||||
copies of the software, and to permit persons to whom the software is furnished
|
||||
to do so.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.
|
||||
|
||||
|
||||
B:
|
||||
|
@ -135,7 +140,7 @@ D:
|
|||
Programs and licenses with other licenses and/or authors than the
|
||||
main license and authors:
|
||||
|
||||
lib/fpdf.php A 2003 Olivier Plathey
|
||||
lib/fpdf.php A 2008 Olivier Plathey
|
||||
lib/font/Vera* B 2003 Bitstream, Inc.
|
||||
templates/lib/wz_tooltip.js C Walter Zorn
|
||||
templates/lib/jquery*.js D 2010 John Resig, 2010 Paul Bakaus
|
||||
|
|
827
lam/lib/fpdf.php
827
lam/lib/fpdf.php
File diff suppressed because it is too large
Load Diff
|
@ -130,7 +130,7 @@ function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='J',$fill=0,$link='')
|
|||
$this->ws=0;
|
||||
$this->_out('0 Tw');
|
||||
}
|
||||
$this->AddPage($this->CurOrientation);
|
||||
$this->AddPage($this->CurOrientation, $this->CurPageFormat);
|
||||
$this->x=$x;
|
||||
if($ws>0)
|
||||
{
|
||||
|
@ -532,13 +532,13 @@ function _putpages()
|
|||
}
|
||||
if($this->DefOrientation=='P')
|
||||
{
|
||||
$wPt=$this->fwPt;
|
||||
$hPt=$this->fhPt;
|
||||
$wPt=$this->DefPageFormat[0]*$this->k;
|
||||
$hPt=$this->DefPageFormat[1]*$this->k;
|
||||
}
|
||||
else
|
||||
{
|
||||
$wPt=$this->fhPt;
|
||||
$hPt=$this->fwPt;
|
||||
$wPt=$this->DefPageFormat[1]*$this->k;
|
||||
$hPt=$this->DefPageFormat[0]*$this->k;
|
||||
}
|
||||
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
|
||||
for($n=1;$n<=$nb;$n++)
|
||||
|
@ -547,8 +547,8 @@ function _putpages()
|
|||
$this->_newobj();
|
||||
$this->_out('<</Type /Page');
|
||||
$this->_out('/Parent 1 0 R');
|
||||
if(isset($this->OrientationChanges[$n]))
|
||||
$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
|
||||
if(isset($this->PageSizes[$n]))
|
||||
$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
|
||||
$this->_out('/Resources 2 0 R');
|
||||
if(isset($this->PageLinks[$n]))
|
||||
{
|
||||
|
@ -563,8 +563,8 @@ function _putpages()
|
|||
else
|
||||
{
|
||||
$l=$this->links[$pl[4]];
|
||||
$h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
|
||||
$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
|
||||
$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
|
||||
$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
|
||||
}
|
||||
}
|
||||
$this->_out($annots.']');
|
||||
|
|
Loading…
Reference in New Issue