📷 A modern, cross-platform, 2D Graphics library for .NET
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Anton Firszov
80e5fe30f2
Merge branch 'master' into feature/memory-manager
# Conflicts:
# src/ImageSharp/Formats/Gif/GifDecoderCore.cs
# src/ImageSharp/Formats/Png/PngEncoderCore.cs
# src/ImageSharp/Image/ImageFrame{TPixel}.cs
# src/ImageSharp/Memory/Buffer{T}.cs
# src/ImageSharp/Memory/PixelDataPool{T}.cs
# src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs
# src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
# src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
# src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
# src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
# src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
# tests/ImageSharp.Tests/Memory/PixelDataPoolTests.cs
# tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
|
8 years ago |
| .. |
|
QuantizedImageTests.cs
|
Merge branch 'master' into feature/memory-manager
|
8 years ago |
