Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upRename IMG_SavePNG* to avoid conflict with PygameSDL2's #1608
Conversation
renpytom
merged commit 10e3acf
into
renpy:master
Oct 29, 2018
Beuc
deleted the
Beuc:patch-1
branch
Nov 10, 2018
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.
Beuc commentedOct 28, 2018
The conflict appears when linking statically, which I do when working on the emscripten port.
(dynamic linking is partially supported in emscripten but not in our case, and it also introduces a performance penalty.)
The 2 functions sets are not exactly the same and do not have the same signatures, hence why I didn't merge them. Note: there is a 3rd set of IMG_SavePNG functions in SDL2_image.