Preserve EXIF data in PillowImage.save_as_png

tests/test_pillow.py

@@ -213,14 +213,24 @@ def test_save_as_png_with_icc_profile(self):
  images = ["colorchecker_sRGB.jpg", "colorchecker_ECI_RGB_v2.jpg"]
  for img_name in images:
  with open(f"tests/images/{img_name}", "rb") as f:
- image = PillowImage.open(JPEGImageFile(f))
+ original = PillowImage.open(JPEGImageFile(f))
  icc_profile = PILImage.open(f).info.get("icc_profile")
  self.assertIsNotNone(icc_profile)
 
- saved = image.save_as_png(io.BytesIO())
+ saved = original.save_as_png(io.BytesIO())
  saved_icc_profile = PILImage.open(saved.f).info.get("icc_profile")
  self.assertEqual(saved_icc_profile, icc_profile)
 
+ def test_save_as_png_with_exif(self):
+ with open("tests/images/colorchecker_sRGB.jpg", "rb") as f:
+ original = PillowImage.open(JPEGImageFile(f))
+ exif = PILImage.open(f).info.get("exif")
+ self.assertIsNotNone(exif)
+
+ saved = original.save_as_png(io.BytesIO())
+ saved_exif = PILImage.open(saved.f).info.get("exif")
+ self.assertEqual(saved_exif, exif)
+
  def test_save_as_gif(self):
  output = io.BytesIO()
  return_value = self.image.save_as_gif(output)

willow/plugins/pillow.py

@@ -242,6 +242,10 @@ def save_as_png(self, f, optimize: bool = False, apply_optimizers: bool = True):
  if icc_profile is not None:
  kwargs["icc_profile"] = icc_profile
 
+ exif_data = self.get_exif_data()
+ if exif_data is not None:
+ kwargs["exif"] = exif_data
+
  image.save(f, "PNG", **kwargs)
  if apply_optimizers:
  self.optimize(f, "png")