Commit 6ff0006e authored by Quentin Ribac's avatar Quentin Ribac
Browse files

Merge branch 'fix/20515/1.8_2' into '1.8'

[20515] MaarchQRSeparator restitution A3 (1.8)

See merge request maarch/MaarchCapture!35
parents 0fe224f9 07e4259a
......@@ -302,7 +302,7 @@ class QRSeparator
$tplidx = $new_pdf->importPage($i);
$specs = $new_pdf->getTemplateSize($tplidx);
$new_pdf->AddPage($specs['orientation']);
$new_pdf->AddPage($specs['orientation'], [$specs['width'], $specs['height']]);
$new_pdf->useTemplate($tplidx, null, null, null, null, true);
......@@ -416,7 +416,7 @@ class QRSeparator
$new_pdf->setSourceFile($split_directory.$file);
$tplidx = $new_pdf->importPage(1);
$specs = $new_pdf->getTemplateSize($tplidx);
$new_pdf->AddPage($specs['orientation']);
$new_pdf->AddPage($specs['orientation'], [$specs['width'], $specs['height']]);
$new_pdf->useTemplate($tplidx);
} else {
// If not a separator and no previous pdf, merge actual pdf
......@@ -430,7 +430,7 @@ class QRSeparator
$new_pdf->setSourceFile($split_directory.$file);
$tplidx = $new_pdf->importPage(1);
$specs = $new_pdf->getTemplateSize($tplidx);
$new_pdf->AddPage($specs['orientation']);
$new_pdf->AddPage($specs['orientation'], [$specs['width'], $specs['height']]);
$new_pdf->useTemplate($tplidx);
return 'NOSEPARATOR';
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment