Fix Form XOBject and update example

tecnickcom · Aug 18, 2024 · a1df9b7 · a1df9b7
1 parent a9db5a8
commit a1df9b7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.0.69
+8.0.70
diff --git a/examples/index.php b/examples/index.php
@@ -1436,33 +1436,31 @@
 
 // ----------
 
-// XOBject template (@TODO: fix the implementation)
+// XOBject template
 
 $pageC02 = $pdf->page->add();
 
 $tid = $pdf->newXObjectTemplate(80, 80, []);
 
-$xcnz = $pdf->graph->getStartTransform();
-$xcnz = $pdf->graph->getStarPolygon(50, 50, 40, 10, 3, 0, 'CNZ');
-$timg = $pdf->image->add('../vendor/tecnickcom/tc-lib-pdf-image/test/images/200x100_GRAY.png');
-$xcnz .= $pdf->image->getSetImage($timg, 10, 10, 80, 80, $pageC02['height']);
-$xcnz .= $pdf->graph->getStopTransform();
 
+$timg = $pdf->image->add('../vendor/tecnickcom/tc-lib-pdf-image/test/images/200x100_RGB.png');
 $pdf->addXObjectImageID($tid, $timg);
+
+$xcnz .= $pdf->image->getSetImage($timg, 10, 10, 80, 80, 80);
 $pdf->addXObjectContent($tid, $xcnz);
 
 $pdf->exitXObjectTemplate();
 
-$tmpl = $pdf->getXObjectTemplate(
-    $tid,
-    0,
-    0,
-    80,
-    80,
-    'T',
-    'L',
-);
+$tmpl = $pdf->graph->getAlpha(0.33);
+$tmpl .= $pdf->getXObjectTemplate($tid, 10, 10, 30, 30, 'T', 'L');
+$pdf->page->addContent($tmpl);
+
+$tmpl = $pdf->graph->getAlpha(0.66);
+$tmpl .= $pdf->getXObjectTemplate($tid, 20, 20, 40, 40, 'T', 'L');
+$pdf->page->addContent($tmpl);
 
+$tmpl = $pdf->graph->getAlpha(1);
+$tmpl .= $pdf->getXObjectTemplate($tid, 40, 40, 60, 60, 'T', 'L');
 $pdf->page->addContent($tmpl);
 
 // ----------

diff --git a/src/Base.php b/src/Base.php
@@ -136,7 +136,7 @@ abstract class Base
     /**
      * TCPDF version.
      */
-    protected string $version = '8.0.69';
+    protected string $version = '8.0.70';
 
     /**
      * Time is seconds since EPOCH when the document was created.

diff --git a/src/Tcpdf.php b/src/Tcpdf.php
@@ -716,7 +716,6 @@ public function getXObjectTemplate(
             'h' => $height,
         ];
 
-        $out = $this->graph->getStartTransform();
         $ctm = [
             0 => ($width / $xobj['w']),
             1 => 0,
@@ -725,6 +724,8 @@ public function getXObjectTemplate(
             4 => $this->toPoints($tplx),
             5 => $this->toYPoints($tply + $height),
         ];
+
+        $out = $this->graph->getStartTransform();
         $out .= $this->graph->getTransformation($ctm);
         $out .= '/' . $xobj['id'] . ' Do' . "\n";
         $out .= $this->graph->getStopTransform();