Browse Source

Revert adding JsonConstructor attributes

pull/2432/head
Brian Popow 3 years ago
parent
commit
79448ec959
  1. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
  2. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
  3. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
  4. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
  5. 17
      src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
  6. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
  7. 9
      src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs

9
src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
/// <summary>
@ -22,13 +20,6 @@ internal class Vp8BandProbas
}
}
/// <summary>
/// Initializes a new instance of the <see cref="Vp8BandProbas"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8BandProbas(Vp8ProbaArray[] probabilities) => this.Probabilities = probabilities;
/// <summary>
/// Gets the Probabilities.
/// </summary>

9
src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
internal class Vp8CostArray
@ -12,12 +10,5 @@ internal class Vp8CostArray
/// </summary>
public Vp8CostArray() => this.Costs = new ushort[67 + 1];
/// <summary>
/// Initializes a new instance of the <see cref="Vp8CostArray"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8CostArray(ushort[] costs) => this.Costs = costs;
public ushort[] Costs { get; }
}

9
src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
internal class Vp8Costs
@ -19,13 +17,6 @@ internal class Vp8Costs
}
}
/// <summary>
/// Initializes a new instance of the <see cref="Vp8Costs"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8Costs(Vp8CostArray[] costs) => this.Costs = costs;
/// <summary>
/// Gets the Costs.
/// </summary>

9
src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
/// <summary>
@ -15,13 +13,6 @@ internal class Vp8ProbaArray
/// </summary>
public Vp8ProbaArray() => this.Probabilities = new byte[WebpConstants.NumProbas];
/// <summary>
/// Initializes a new instance of the <see cref="Vp8ProbaArray"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8ProbaArray(byte[] probabilities) => this.Probabilities = probabilities;
/// <summary>
/// Gets the probabilities.
/// </summary>

17
src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs

@ -7,7 +7,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.X86;
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
@ -16,22 +15,6 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
/// </summary>
internal class Vp8Residual
{
public Vp8Residual()
{
}
[JsonConstructor]
public Vp8Residual(int first, int last, int coeffType, short[] coeffs, Vp8BandProbas[] prob, Vp8Stats[] stats, Vp8Costs[] costs)
{
this.First = first;
this.Last = last;
this.CoeffType = coeffType;
this.Coeffs = coeffs;
this.Prob = prob;
this.Stats = stats;
this.Costs = costs;
}
public int First { get; set; }
public int Last { get; set; }

9
src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
internal class Vp8Stats
@ -19,12 +17,5 @@ internal class Vp8Stats
}
}
/// <summary>
/// Initializes a new instance of the <see cref="Vp8Stats"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8Stats(Vp8StatsArray[] stats) => this.Stats = stats;
public Vp8StatsArray[] Stats { get; }
}

9
src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs

@ -1,8 +1,6 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using System.Text.Json.Serialization;
namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
internal class Vp8StatsArray
@ -12,12 +10,5 @@ internal class Vp8StatsArray
/// </summary>
public Vp8StatsArray() => this.Stats = new uint[WebpConstants.NumProbas];
/// <summary>
/// Initializes a new instance of the <see cref="Vp8StatsArray"/> class.
/// Only used for unit tests.
/// </summary>
[JsonConstructor]
public Vp8StatsArray(uint[] stats) => this.Stats = stats;
public uint[] Stats { get; }
}

Loading…
Cancel
Save