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

Difference between our current master and IldarKhayrutdinov:tiff-codec #988

Closed
wants to merge 90 commits into from

Conversation

antonfirsov
Copy link
Member

DO NOT MERGE

Close it as soon as #986 is merged.

This is only intended to show "real" diff for #986, including only TIFF related changes.

JimBobSquarePants and others added 27 commits February 8, 2018 23:24
… tiff-codec

# Conflicts:
#	src/ImageSharp/Configuration.cs
#	src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
#	src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
#	src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs
#	tests/ImageSharp.Tests/ConfigurationTests.cs
Correct Metadata updated name (for Resolution properties), temporary disable tiff native metadata properties.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants