Fix: Proper WMF/EMF image handling in PPTXReader #17819
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
the
size:M
| output_path = file_path.with_suffix(".png") | ||
|
|
||
| if sys.platform == "win32": | ||
| libreoffice_path = r"C:\Program Files\LibreOffice\program\soffice.exe" |
There was a problem hiding this comment.
uhhh this is a pretty strong assumption on the location of this executable
There was a problem hiding this comment.
You're right, how about just searching for the path first, and if nothing was found checking for default installation paths as fallback. I also created a new function with the single purpose of finding the libreoffice path, and put the basic imports into the import section.
def find_libreoffice(self) -> str:
"""Finds the LibreOffice executable path."""
libreoffice_path = shutil.which("soffice")
if not libreoffice_path and sys.platform == "win32":
# Check common installation paths on Windows
possible_paths = [
r"C:\Program Files\LibreOffice\program\soffice.exe",
r"C:\Program Files (x86)\LibreOffice\program\soffice.exe",
]
libreoffice_path = next(
(path for path in possible_paths if os.path.exists(path)), None
)
if not libreoffice_path:
raise OSError(
"LibreOffice (soffice) not found. Please install LibreOffice or add it to your system PATH."
)
return libreoffice_path
def convert_wmf_to_png(self, input_path: str) -> str:
"""Convert WMF/EMF to PNG using LibreOffice."""
file_path = Path(input_path)
output_path = file_path.with_suffix(".png")
libreoffice_path = self.find_libreoffice()
subprocess.run(
[
libreoffice_path,
"--headless",
"--convert-to",
"png",
"--outdir",
str(file_path.parent),
str(file_path),
],
check=True,
)
return str(output_path)
Leon-Sander
force-pushed
the
fix-pptx-reader-wmf-emf-handling
branch
from
749075e to
3a53caf
Compare
Leon-Sander
force-pushed
the
fix-pptx-reader-wmf-emf-handling
branch
from
3a53caf to
e316a1c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes a bug in
PPTXReaderwhere.wmfand.emfimages cause crashes due toPIL.Image.open()not supporting these formats.Key Changes:
.wmfand.emfimages are automatically converted to PNG before processing.PIL.Image.open()to prevent crashes from unreadable or corrupt images.Fixes: #17820
New Package?
Version Bump?
Type of Change
How Has This Been Tested?
.wmfand.emfimages.Suggested Checklist
make format; make lintto ensure proper formatting.