Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken regression PCX and enable pillow 8.1.0 with an improved error message #188

Merged
merged 3 commits into from Feb 6, 2021

Conversation

@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 6, 2021

As pointed in #182, GIMP now creates valid PCX. So I think it's OK to fix our broken files.

That allows to use pillow 8.1.0 as regression now pass.

As broken PCX may still be in the wild, giving a nice error message will help by displaying directly which file causes failure.

nml/spriteencoder.py Outdated Show resolved Hide resolved
@glx22 glx22 merged commit 79a13f0 into OpenTTD:master Feb 6, 2021
21 checks passed
@glx22 glx22 deleted the pillow branch Feb 6, 2021
@matthijskooijman
Copy link
Contributor

@matthijskooijman matthijskooijman commented Feb 13, 2021

Cool, thanks for this fix. A user from Debian also confirmed that these new PCX files fix the build of the Debian package as well: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980641#15

Are there plans for a new release with these changes included, maybe? Because this changes binary files, I believe backporting these changes is not as easy as with text files, so a new release would probably be the easiest way to get this fixed in Debian (but if not, I can probably add some scripts to update the binary files anyway).

@matthijskooijman
Copy link
Contributor

@matthijskooijman matthijskooijman commented Feb 28, 2021

Are there plans for a new release with these changes included, maybe? Because this changes binary files, I believe backporting these changes is not as easy as with text files, so a new release would probably be the easiest way to get this fixed in Debian (but if not, I can probably add some scripts to update the binary files anyway).

Never mind this, I ended up adding the scripts to backport the fixed pcx files, so this is no longer an issue for Debian. Also, Debian is in softfreeze, so it's unlikely that any upstream version newer than 0.5.3 (unless it is really a consise bugfix-only release) will be used for the upcoming Debian bullseye.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants