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

Replace System.Drawing.Bitmap with our own 32bit png png loader #15930

Merged
merged 7 commits into from Jan 8, 2019

Conversation

@pchote
Copy link
Member

commented Dec 22, 2018

This PR takes the first step towards being able to remove our dependency on System.Drawing and therefore libgdiplus and the problems that brings. The remaining uses depend on write support, which will need to come in a future PR.

Closes #15765.
Fixes #15970.
Implements the first step towards #15955 and #15954.

@pchote pchote requested review from chrisforbes and RoosterDragon Dec 22, 2018

@pchote pchote force-pushed the pchote:rgba-png-loader branch from a528e1c to d9064a1 Dec 22, 2018

@pchote

This comment has been minimized.

Copy link
Member Author

commented Dec 22, 2018

Added a commit supporting paletted pngs for UI artwork as requested in IRC. I don't have a testcase for this, however.

@pchote pchote force-pushed the pchote:rgba-png-loader branch from 84c82d3 to 504502f Dec 23, 2018

@pchote

This comment has been minimized.

Copy link
Member Author

commented Dec 23, 2018

Updated to remove System.Drawing.Imaging.PixelFormat from the png loader. It was silly to spray this across a bunch of engine files considering the main point of the change is to remove System.Drawing. I also squashed the paletted UI png commit into the UI artwork commit to avoid reviewing redundant code.

@RoosterDragon
Copy link
Member

left a comment

No real issues I can see here.

OpenRA.Game/FileFormats/Png.cs Outdated Show resolved Hide resolved

@pchote pchote force-pushed the pchote:rgba-png-loader branch from 48eb93d to eee66c8 Dec 31, 2018

@pchote

This comment has been minimized.

Copy link
Member Author

commented Dec 31, 2018

Updated.

@pchote pchote merged commit b1e87e4 into OpenRA:bleed Jan 8, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pchote pchote deleted the pchote:rgba-png-loader branch Jan 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.