Browse Source

Merge branch 'master' into af/loadresizesave-stress

pull/1687/head
Anton Firszov 5 years ago
committed by GitHub
parent
commit
d5d63feed4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/ImageSharp/Formats/Jpeg/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
  2. 1
      tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
  3. 1
      tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
  4. 1
      tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
  5. 1
      tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
  6. 1
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  7. 1
      tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
  8. 1
      tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
  9. 1
      tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
  10. 1
      tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs
  11. 1
      tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs
  12. 1
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
  13. 1
      tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs

4
src/ImageSharp/Formats/Jpeg/Components/Encoder/YCbCrForwardConverter{TPixel}.cs

@ -13,8 +13,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder
{ {
public static void LoadAndStretchEdges(RowOctet<TPixel> source, Span<TPixel> dest, Point start, Size sampleSize, Size totalSize) public static void LoadAndStretchEdges(RowOctet<TPixel> source, Span<TPixel> dest, Point start, Size sampleSize, Size totalSize)
{ {
DebugGuard.MustBeBetweenOrEqualTo(start.X, 1, totalSize.Width - 1, nameof(start.X)); DebugGuard.MustBeBetweenOrEqualTo(start.X, 0, totalSize.Width - 1, nameof(start.X));
DebugGuard.MustBeBetweenOrEqualTo(start.Y, 1, totalSize.Height - 1, nameof(start.Y)); DebugGuard.MustBeBetweenOrEqualTo(start.Y, 0, totalSize.Height - 1, nameof(start.Y));
int width = Math.Min(sampleSize.Width, totalSize.Width - start.X); int width = Math.Min(sampleSize.Width, totalSize.Width - start.X);
int height = Math.Min(sampleSize.Height, totalSize.Height - start.Y); int height = Math.Min(sampleSize.Height, totalSize.Height - start.Y);

1
tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs

@ -20,6 +20,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Bmp namespace SixLabors.ImageSharp.Tests.Formats.Bmp
{ {
[Collection("RunSerial")]
[Trait("Format", "Bmp")] [Trait("Format", "Bmp")]
public class BmpDecoderTests public class BmpDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs

@ -19,6 +19,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Bmp namespace SixLabors.ImageSharp.Tests.Formats.Bmp
{ {
[Collection("RunSerial")]
[Trait("Format", "Bmp")] [Trait("Format", "Bmp")]
public class BmpEncoderTests public class BmpEncoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@ -17,6 +17,7 @@ using Xunit;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Gif namespace SixLabors.ImageSharp.Tests.Formats.Gif
{ {
[Collection("RunSerial")]
[Trait("Format", "Gif")] [Trait("Format", "Gif")]
public class GifDecoderTests public class GifDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs

@ -14,6 +14,7 @@ using Xunit;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Gif namespace SixLabors.ImageSharp.Tests.Formats.Gif
{ {
[Collection("RunSerial")]
[Trait("Format", "Gif")] [Trait("Format", "Gif")]
public class GifEncoderTests public class GifEncoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@ -22,6 +22,7 @@ using Xunit.Abstractions;
namespace SixLabors.ImageSharp.Tests.Formats.Jpg namespace SixLabors.ImageSharp.Tests.Formats.Jpg
{ {
// TODO: Scatter test cases into multiple test classes // TODO: Scatter test cases into multiple test classes
[Collection("RunSerial")]
[Trait("Format", "Jpg")] [Trait("Format", "Jpg")]
public partial class JpegDecoderTests public partial class JpegDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs

@ -20,6 +20,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Formats.Jpg namespace SixLabors.ImageSharp.Tests.Formats.Jpg
{ {
[Collection("RunSerial")]
[Trait("Format", "Jpg")] [Trait("Format", "Jpg")]
public class JpegEncoderTests public class JpegEncoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs

@ -16,6 +16,7 @@ using Xunit;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Png namespace SixLabors.ImageSharp.Tests.Formats.Png
{ {
[Collection("RunSerial")]
[Trait("Format", "Png")] [Trait("Format", "Png")]
public partial class PngDecoderTests public partial class PngDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@ -15,6 +15,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Formats.Png namespace SixLabors.ImageSharp.Tests.Formats.Png
{ {
[Collection("RunSerial")]
[Trait("Format", "Png")] [Trait("Format", "Png")]
public partial class PngEncoderTests public partial class PngEncoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs

@ -16,6 +16,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tga;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Tga namespace SixLabors.ImageSharp.Tests.Formats.Tga
{ {
[Collection("RunSerial")]
[Trait("Format", "Tga")] [Trait("Format", "Tga")]
public class TgaDecoderTests public class TgaDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs

@ -13,6 +13,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tga;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Tga namespace SixLabors.ImageSharp.Tests.Formats.Tga
{ {
[Collection("RunSerial")]
[Trait("Format", "Tga")] [Trait("Format", "Tga")]
public class TgaEncoderTests public class TgaEncoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

@ -17,6 +17,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tiff;
namespace SixLabors.ImageSharp.Tests.Formats.Tiff namespace SixLabors.ImageSharp.Tests.Formats.Tiff
{ {
[Collection("RunSerial")]
[Trait("Format", "Tiff")] [Trait("Format", "Tiff")]
public class TiffDecoderTests public class TiffDecoderTests
{ {

1
tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs

@ -17,6 +17,7 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tiff;
namespace SixLabors.ImageSharp.Tests.Formats.Tiff namespace SixLabors.ImageSharp.Tests.Formats.Tiff
{ {
[Collection("RunSerial")]
[Trait("Format", "Tiff")] [Trait("Format", "Tiff")]
public class TiffEncoderTests public class TiffEncoderTests
{ {

Loading…
Cancel
Save