Added support for embedding indexed images

fpdf/fpdf.py

@@ -4044,11 +4044,11 @@ def _putimage(self, info):
         # Palette
         if info["cs"] == "Indexed":
             self._newobj()
-            filter, pal = (
-                ("/Filter /FlateDecode ", zlib.compress(info["pal"]))
-                if self.compress
-                else ("", info["pal"])
-            )
+            if self.compress:
+                filter, pal = ("/Filter /FlateDecode ", zlib.compress(info["pal"]))
+            else:
+                filter, pal = ("", info["pal"])
+                
             self._out(f"<<{filter}/Length {len(pal)}>>")
             self._out(pdf_stream(pal))
             self._out("endobj")

fpdf/image_parsing.py

@@ -56,15 +56,20 @@ def get_img_info(img, image_filter="AUTO", dims=None):
     """
     if Image is None:
         raise EnvironmentError("Pillow not available - fpdf2 cannot insert images")
+
     if not isinstance(img, Image.Image):
         img = Image.open(img)
+
     if dims:
         img = img.resize(dims, resample=RESAMPLE)
+
     if image_filter == "AUTO":
         # Very simple logic for now:
         image_filter = "DCTDecode" if img.format == "JPEG" else "FlateDecode"
-    if img.mode not in ("L", "LA", "RGB", "RGBA"):
+
+    if img.mode not in ("L", "LA", "RGB", "RGBA", "P", "PA"):
         img = img.convert("RGBA")
+
     w, h = img.size
     info = {}
     if img.mode == "L":
@@ -79,6 +84,20 @@ def get_img_info(img, image_filter="AUTO", dims=None):
             "JPXDecode",
         ):
             info["smask"] = _to_data(img, image_filter, select_slice=alpha_channel)
+    elif img.mode == "P":
+        dpn, bpc, colspace = 1, 8, "Indexed"
+        info["data"] = _to_data(img, image_filter)
+        info["pal"] = img.palette.palette
+    elif img.mode == "PA":
+        dpn, bpc, colspace = 1, 8, "Indexed"
+        info["pal"] = img.palette.palette
+        alpha_channel = slice(1, None, 2)
+        info["data"] = _to_data(img, image_filter, remove_slice=alpha_channel)
+        if _has_alpha(img, alpha_channel) and image_filter not in (
+            "DCTDecode",
+            "JPXDecode",
+        ):
+            info["smask"] = _to_data(img, image_filter, select_slice=alpha_channel)
     elif img.mode == "RGB":
         dpn, bpc, colspace = 3, 8, "DeviceRGB"
         info["data"] = _to_data(img, image_filter)
@@ -102,7 +121,6 @@ def get_img_info(img, image_filter="AUTO", dims=None):
             "bpc": bpc,
             "f": image_filter,
             "dp": dp,
-            "pal": "",
             "trns": "",
         }
     )
@@ -113,18 +131,26 @@ def get_img_info(img, image_filter="AUTO", dims=None):
 def _to_data(img, image_filter, **kwargs):
     if image_filter == "FlateDecode":
         return _to_zdata(img, **kwargs)
+
     if img.mode == "LA":
         img = img.convert("L")
+
     if img.mode == "RGBA":
         img = img.convert("RGB")
+
+    if img.mode == "PA":
+        img = img.convert("P")
+
     if image_filter == "DCTDecode":
         compressed_bytes = BytesIO()
         img.save(compressed_bytes, format="JPEG")
         return compressed_bytes.getvalue()
+
     if image_filter == "JPXDecode":
         compressed_bytes = BytesIO()
         img.save(compressed_bytes, format="JPEG2000")
         return compressed_bytes.getvalue()
+
     raise FPDFException(f'Unsupported image filter: "{image_filter}"')
 
 

test/image/png_indexed/test_png_indexed.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+
+import fpdf
+from test.conftest import assert_pdf_equal
+from PIL import Image
+
+
+HERE = Path(__file__).resolve().parent
+
+
+def test_png_indexed_files(tmp_path):
+    pdf = fpdf.FPDF()
+    pdf.add_page()
+
+    # palette images (P)
+    pdf.image(HERE / "palette_1.png", x=10, y=10, w=50, h=50, link=None)
+    pdf.image(HERE / "palette_2.png", x=80, y=10, w=50, h=50, link=None)
+    pdf.image(HERE / "palette_3.png", x=150, y=10, w=50, h=50, link=None)
+
+    # palette with alpha images (PA)
+    pdf.image(
+        Image.open(HERE / "palette_1.png").convert("PA"),
+        x=10,
+        y=80,
+        w=50,
+        h=50,
+        link=None,
+    )
+    pdf.image(
+        Image.open(HERE / "palette_2.png").convert("PA"),
+        x=80,
+        y=80,
+        w=50,
+        h=50,
+        link=None,
+    )
+    pdf.image(
+        Image.open(HERE / "palette_3.png").convert("PA"),
+        x=150,
+        y=80,
+        w=50,
+        h=50,
+        link=None,
+    )
+
+    assert_pdf_equal(pdf, HERE / "image_png_indexed.pdf", tmp_path)