moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-12-17 22:58:51 +01:00
commit 1f71f7685a
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mod/assign/feedback/editpdf/classes/pdf.php
View file

@ -77,6 +77,8 @@ class pdf extends \FPDI {
*/ */
public function combine_pdfs($pdflist, $outfilename) { public function combine_pdfs($pdflist, $outfilename) {
raise_memory_limit(MEMORY_EXTRA);
$this->setPageUnit('pt'); $this->setPageUnit('pt');
$this->setPrintHeader(false); $this->setPrintHeader(false);
$this->setPrintFooter(false); $this->setPrintFooter(false);
@ -122,6 +124,8 @@ class pdf extends \FPDI {
* @return int the number of pages in the PDF * @return int the number of pages in the PDF
*/ */
public function load_pdf($filename) { public function load_pdf($filename) {
raise_memory_limit(MEMORY_EXTRA);
$this->setPageUnit('pt'); $this->setPageUnit('pt');
$this->scale = 72.0 / 100.0; $this->scale = 72.0 / 100.0;
$this->SetFont('helvetica', '', 16.0 * $this->scale); $this->SetFont('helvetica', '', 16.0 * $this->scale);
@ -133,6 +137,7 @@ class pdf extends \FPDI {
$this->setPrintFooter(false); $this->setPrintFooter(false);
$this->pagecount = $this->setSourceFile($filename); $this->pagecount = $this->setSourceFile($filename);
$this->filename = $filename; $this->filename = $filename;
return $this->pagecount; return $this->pagecount;
} }