Fixing image insertion in tables (#773)

Author: Lucas-C

CHANGELOG.md

@@ -22,6 +22,7 @@ This can also be enabled programmatically with `warnings.simplefilter('default',
 - documentation on how to use `fpdf2` with [FastAPI](https://fastapi.tiangolo.com/): <https://pyfpdf.github.io/fpdf2/UsageInWebAPI.html#FastAPI> - thanks to @KamarulAdha
 - [`FPDF.write_html()`](https://pyfpdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html): `<table>` elements can now be aligned left or right on the page using `align=`
 ### Fixed
+- [`FPDF.table()`](https://pyfpdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.table): images no more overflow cells
 - [`FPDF.table()`](https://pyfpdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.table): text overflow in the last cell of the header row is now properly handled
 - [`FPDF.table()`](https://pyfpdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.table): when `align="RIGHT"` is provided, the page right margin is now properly taken in consideration
 ### Changed

fpdf/fpdf.py

@@ -3346,15 +3346,19 @@ def _has_next_page(self):
     @contextmanager
     def _disable_writing(self):
         self._out = lambda *args, **kwargs: None
-        self.add_page = lambda *args, **kwargs: None
-        self._perform_page_break = lambda *args, **kwargs: None
-        prev_x, prev_y = self.x, self.y
-        yield
-        # restore writing functions:
-        del self.add_page
-        del self._out
-        del self._perform_page_break
-        self.set_xy(prev_x, prev_y)  # restore location
+        prev_page, prev_x, prev_y = self.page, self.x, self.y
+        self._push_local_stack()
+        try:
+            yield
+        finally:
+            self._pop_local_stack()
+            # restore location:
+            for p in range(prev_page + 1, self.page + 1):
+                del self.pages[p]
+            self.page = prev_page
+            self.set_xy(prev_x, prev_y)
+            # restore writing function:
+            del self._out
 
     @check_page
     def multi_cell(

fpdf/table.py

@@ -219,14 +219,15 @@ def _render_table_cell(
         row = self.rows[i]
         cell = row.cells[j]
         col_width = self._get_col_width(i, j, cell.colspan)
+        img_height = 0
         if cell.img:
             x, y = self._fpdf.x, self._fpdf.y
-            self._fpdf.image(
+            img_height = self._fpdf.image(
                 cell.img,
                 w=col_width,
                 h=0 if cell.img_fill_width else row_height,
                 keep_aspect_ratio=True,
-            )
+            ).rendered_height
             self._fpdf.set_xy(x, y)
         text_align = cell.align or self._text_align
         if not isinstance(text_align, (Align, str)):
@@ -255,7 +256,7 @@ def _render_table_cell(
                 else FontFace(fill_color=self._cell_fill_color)
             )
         with self._fpdf.use_font_face(style):
-            page_break, height = self._fpdf.multi_cell(
+            page_break, cell_height = self._fpdf.multi_cell(
                 w=col_width,
                 h=row_height,
                 txt=cell.text,
@@ -269,7 +270,7 @@ def _render_table_cell(
                 output=MethodReturnValue.PAGE_BREAK | MethodReturnValue.HEIGHT,
                 **kwargs,
             )
-        return page_break, height
+        return page_break, max(img_height, cell_height)
 
     def _get_col_width(self, i, j, colspan=1):
         if not self._col_widths:

test/html/html_table_with_imgs_captions_and_colspan.pdf

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-import pytest
+import qrcode, pytest
 
 from fpdf import FPDF
 from test.conftest import assert_pdf_equal, LOREM_IPSUM
@@ -66,11 +66,7 @@ def test_table_with_images_and_img_fill_width(tmp_path):
                     row.cell(img=datum, img_fill_width=True)
                 else:
                     row.cell(datum)
-    assert_pdf_equal(
-        pdf,
-        HERE / "table_with_images_and_img_fill_width.pdf",
-        tmp_path,
-    )
+    assert_pdf_equal(pdf, HERE / "table_with_images_and_img_fill_width.pdf", tmp_path)
 
 
 def test_table_with_multiline_cells_and_images(tmp_path):
@@ -101,3 +97,15 @@ def test_table_with_images_and_text():
                         row.cell(datum.name, img=datum)
                     else:
                         row.cell(datum)
+
+
+def test_table_with_qrcode(tmp_path):  # issue 771
+    pdf = FPDF()
+    pdf.add_page()
+    pdf.set_font("Times", size=16)
+    qrCodeGenerated = qrcode.make("https://google.com")
+    with pdf.table(first_row_as_headings=False) as table:
+        row = table.row()
+        row.cell(img=qrCodeGenerated.get_image(), img_fill_width=True)
+        row.cell("Other field")
+    assert_pdf_equal(pdf, HERE / "table_with_qrcode.pdf", tmp_path)