Browse Source

Master cleanup (#952)

* Fix gitignore and line endings

* Update README.md
af/merge-core
James Jackson-South 7 years ago
committed by GitHub
parent
commit
5abca49055
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .gitattributes
  2. 9
      .gitignore
  3. 8
      README.md
  4. BIN
      src/ImageSharp/Formats/Jpeg/5116.DCT_Filter.pdf
  5. BIN
      src/ImageSharp/Formats/Jpeg/itu-t81.pdf
  6. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs
  7. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs
  8. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.cs
  9. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.cs
  10. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs
  11. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs
  12. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs
  13. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs

2
.gitattributes

@ -44,7 +44,7 @@
*.sql text eol=lf *.sql text eol=lf
*.svg text eol=lf *.svg text eol=lf
*.targets text eol=lf *.targets text eol=lf
*.tt text eol=lf *.tt text eol=crlf
*.ttinclude text eol=crlf *.ttinclude text eol=crlf
*.txt text eol=lf *.txt text eol=lf
*.vb text eol=lf *.vb text eol=lf

9
.gitignore

@ -204,8 +204,6 @@ FakesAssemblies/
**/node_modules **/node_modules
**/node_modules/* **/node_modules/*
**/Images/ActualOutput
**/Images/ReferenceOutput
# ASP.NET 5 # ASP.NET 5
project.lock.json project.lock.json
@ -218,7 +216,8 @@ artifacts/
*.csproj.bak *.csproj.bak
#CodeCoverage #CodeCoverage
**/CodeCoverage/*
docs/
/samples/AvatarWithRoundedCorner/output
/ImageSharp.Coverage.xml /ImageSharp.Coverage.xml
# Tests
**/Images/ActualOutput
**/Images/ReferenceOutput

8
README.md

@ -118,12 +118,18 @@ Alternatively, you can work from command line and/or with a lightweight editor o
- [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) - [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)
- [.NET Core](https://www.microsoft.com/net/core#linuxubuntu) - [.NET Core](https://www.microsoft.com/net/core#linuxubuntu)
To clone ImageSharp locally, click the "Clone in Windows" button above or run the following git commands: To clone ImageSharp locally, click the "Clone in [YOUR_OS]" button above or run the following git commands:
```bash ```bash
git clone https://github.com/SixLabors/ImageSharp git clone https://github.com/SixLabors/ImageSharp
``` ```
If working with Windows please ensure that you have enabled log file paths in git (run as Administrator).
```bash
git config --system core.longpaths true
```
### Submodules ### Submodules
This repository contains [git submodules](https://blog.github.com/2016-02-01-working-with-submodules/). To add the submodules to the project, navigate to the repository root and type: This repository contains [git submodules](https://blog.github.com/2016-02-01-working-with-submodules/). To add the submodules to the project, navigate to the repository root and type:

BIN
src/ImageSharp/Formats/Jpeg/5116.DCT_Filter.pdf

Binary file not shown.

BIN
src/ImageSharp/Formats/Jpeg/itu-t81.pdf

Binary file not shown.

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -231,7 +230,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToArgb32(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToArgb32(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -231,7 +230,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToBgra32(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToBgra32(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -194,7 +193,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToGray16(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToGray16(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -194,7 +193,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToGray8(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToGray8(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -205,7 +204,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToRgb24(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToRgb24(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -194,7 +193,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToRgb48(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToRgb48(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -220,7 +219,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToRgba32(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToRgba32(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs

@ -11,7 +11,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SixLabors.ImageSharp.PixelFormats namespace SixLabors.ImageSharp.PixelFormats
{ {
/// <content> /// <content>
@ -194,7 +193,6 @@ namespace SixLabors.ImageSharp.PixelFormats
{ {
PixelOperations<TSourcePixel>.Instance.ToRgba64(configuration, sourcePixels, destinationPixels); PixelOperations<TSourcePixel>.Instance.ToRgba64(configuration, sourcePixels, destinationPixels);
} }
} }
} }
} }

Loading…
Cancel
Save