Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
0c45f37
Merge pull request #1 from SixLabors/master
ynse01 Apr 1, 2021
319beee
Merge branch 'SixLabors:master' into master
ynse01 Nov 17, 2021
065cb1c
Fix vanilla build on VS2019
ynse01 Nov 17, 2021
251e802
Revert of: Fix vanilla build on VS2019
ynse01 Nov 18, 2021
49d9266
Merge branch 'master' of https://github.com/ynse01/ImageSharp
ynse01 Nov 18, 2021
100e788
Merge branch 'SixLabors:master' into master
ynse01 Nov 18, 2021
a13eae6
Merge branch 'SixLabors:master' into master
ynse01 Nov 24, 2021
7510250
Support Pbm, Pgm and Ppm images
ynse01 Nov 24, 2021
b87362d
Fix style warning in BinaryDecoder
ynse01 Nov 25, 2021
5939bf8
Restore LangVersion
ynse01 Nov 25, 2021
0c8c892
Process first round of review comments
ynse01 Nov 27, 2021
0e984cf
Remove non existing LFS objects
ynse01 Nov 28, 2021
e21d2c3
Put back missing LFS objects
ynse01 Nov 28, 2021
7d1c3b5
Remove test images, so they can be moved to LFS
ynse01 Nov 29, 2021
c600274
Merge branch 'SixLabors:master' into pgm-support
ynse01 Nov 29, 2021
593c84c
Merge branch 'pgm-support' of https://github.com/ynse01/ImageSharp in…
ynse01 Nov 29, 2021
2b00a22
Put the test images back into LFS
ynse01 Nov 29, 2021
9599efe
Update .gitattributes file
ynse01 Nov 29, 2021
58a1dd8
Merge branch 'master' into pgm-support
JimBobSquarePants Nov 30, 2021
cf8e184
Revert stack allocation in Plain Encoder
ynse01 Nov 30, 2021
87ce4e5
Various review comments
ynse01 Dec 1, 2021
a5e1723
Dispose of images after use, in Pbm Round Trip Test
ynse01 Dec 1, 2021
e17ebe6
Merge branch 'master' into pgm-support
JimBobSquarePants Dec 1, 2021
26b3e66
Fix bug in black and white plain decoding
ynse01 Dec 3, 2021
5587770
Merge branch 'pgm-support' of https://github.com/ynse01/ImageSharp in…
ynse01 Dec 3, 2021
c4cf012
Scale pixel value up to full allocation range
ynse01 Dec 3, 2021
a5af74e
Merge branch 'master' into pgm-support
antonfirsov Dec 4, 2021
284772c
Push input images to LFS again
ynse01 Dec 4, 2021
20b0349
NeedsUpscaling code improvements
ynse01 Dec 4, 2021
3a0a044
Improve exception messages
ynse01 Dec 4, 2021
61cfa66
Make variables as const if possible
ynse01 Dec 4, 2021
5e27397
Merge branch 'master' into pgm-support
brianpopow Dec 4, 2021
dd49f9a
Single image compare utils for multiple Formats
ynse01 Dec 5, 2021
1aa27bd
Add Magick compatible input image
ynse01 Dec 5, 2021
093e1ae
Add missing using
brianpopow Dec 5, 2021
f09641c
Cleanup
brianpopow Dec 5, 2021
a581ab6
Merge branch 'master' into pgm-support
brianpopow Dec 6, 2021
f6301d4
Refactor Pbm option enums
ynse01 Dec 8, 2021
7494525
Write EOF indicated for plain encoding
ynse01 Dec 10, 2021
b2bc25c
No need to await async PbmDecoder methods
ynse01 Dec 10, 2021
efece70
Partial revert of b2bc25c
ynse01 Dec 10, 2021
6619809
Merge remote-tracking branch 'upstream/master' into pgm-support
ynse01 Dec 10, 2021
3730a02
Fix build after merge
ynse01 Dec 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into pgm-support
  • Loading branch information
JimBobSquarePants authored Nov 30, 2021
commit 58a1dd8a6df8399b062cbeb7c70dae209e317f18

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.