Merge pull request AUTOMATIC1111#16194 from light-and-ray/fix_cannot_…

…write_mode_P_as_jpeg fix OSError: cannot write mode P as JPEG
tooonuch · Jul 20, 2024 · 7b99e14 · 7b99e14
2 parents 7c8a4cc + 3d2dbef
commit 7b99e14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/api/api.py b/modules/api/api.py
@@ -113,7 +113,7 @@ def encode_pil_to_base64(image):
             image.save(output_bytes, format="PNG", pnginfo=(metadata if use_metadata else None), quality=opts.jpeg_quality)
 
         elif opts.samples_format.lower() in ("jpg", "jpeg", "webp"):
-            if image.mode == "RGBA":
+            if image.mode in ("RGBA", "P"):
                 image = image.convert("RGB")
             parameters = image.info.get('parameters', None)
             exif_bytes = piexif.dump({

diff --git a/modules/shared_state.py b/modules/shared_state.py
@@ -162,7 +162,7 @@ def do_set_current_image(self):
             errors.record_exception()
 
     def assign_current_image(self, image):
-        if shared.opts.live_previews_image_format == 'jpeg' and image.mode == 'RGBA':
+        if shared.opts.live_previews_image_format == 'jpeg' and image.mode in ('RGBA', 'P'):
             image = image.convert('RGB')
         self.current_image = image
         self.id_live_preview += 1