tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge Core remote [skip ci] 

# Conflicts:
#	src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs


Former-commit-id: 638883c5faae62f084df357295c3d8323fa4b778
Former-commit-id: fe37826196dbb72f951afa895a546f703f2b0949
Former-commit-id: 8cd006375c3d83e1b49d6a4342521817ba21111e
pull/1/head
James Jackson-South 10 years ago
parent
cb8f3af130 643fbd7a00
commit
0e03aea870
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README.md
  2. 2
      src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id

4
README.md
View File

@ -5,7 +5,7 @@
**ImageProcessorCore** is a new cross-platform 2D graphics API designed to allow the processing of images without the use of `System.Drawing`. **ImageProcessorCore** is a new cross-platform 2D graphics API designed to allow the processing of images without the use of `System.Drawing`.
> **ImageProcessorCore is still in early stages (alpha) but progress has been pretty quick. As such, please do not use on production environments until the library reaches release candidate status.** > **ImageProcessorCore is still in early stages (alpha) but progress has been pretty quick. As such, please do not use on production environments until the library reaches release candidate status. Pre-release downloads are available from the [MyGet package repository](https://www.myget.org/gallery/imageprocessor).**
> For the older `ImageFactory` based API that uses `System.Drawing` please check out the [Framework](https://github.com/JimBobSquarePants/ImageProcessor/tree/Framework) branch. > For the older `ImageFactory` based API that uses `System.Drawing` please check out the [Framework](https://github.com/JimBobSquarePants/ImageProcessor/tree/Framework) branch.
@ -180,7 +180,7 @@ using (FileStream output = File.OpenWrite("bar.jpg"))
Individual processors can be initialised and apply processing against images. This allows nesting which brings the potential for powerful combinations of processing methods: Individual processors can be initialised and apply processing against images. This allows nesting which brings the potential for powerful combinations of processing methods:
```csharp ```csharp
new Brightness(50).Apply(sourceImage, targetImage, sourceImage.Bounds); new BrightnessProcessor(50).Apply(sourceImage, sourceImage.Bounds);
``` ```
Setting individual pixel values is perfomed as follows: Setting individual pixel values is perfomed as follows:

2
src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id
View File

@ -1 +1 @@
18ba33702f55471f2064a0757b41734924775738 efdc36c9d84d1fd42bf3b1e722946bccef95db1c
Write Preview
Loading…
Cancel
Save