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

Removed unused methods & constructor, fixed warnings

pull/1761/head
Dmitry Pentin 5 years ago
parent
f9b36e794d
commit
787ffa57ee
4 changed files with 34 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
  2. 4
      tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
  3. 38
      tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs
  4. 2
      tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs

77
src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
View File

@ -28,17 +28,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
/// </summary>
private fixed short data[Size];
/// <summary>
/// Initializes a new instance of the <see cref="Block8x8"/> struct.
/// </summary>
/// <param name="coefficients">A <see cref="Span{T}"/> of coefficients</param>
public Block8x8(Span<short> coefficients)
{
ref byte selfRef = ref Unsafe.As<Block8x8, byte>(ref this);
ref byte sourceRef = ref Unsafe.As<short, byte>(ref MemoryMarshal.GetReference(coefficients));
Unsafe.CopyBlock(ref selfRef, ref sourceRef, Size * sizeof(short));
}
/// <summary>
/// Gets or sets a <see cref="short"/> value at the given index
/// </summary>
@ -75,15 +64,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
set => this[(y * 8) + x] = value;
}
public static bool operator ==(Block8x8 left, Block8x8 right)
{
return left.Equals(right);
}
public static bool operator ==(Block8x8 left, Block8x8 right) => left.Equals(right);
public static bool operator !=(Block8x8 left, Block8x8 right)
{
return !left.Equals(right);
}
public static bool operator !=(Block8x8 left, Block8x8 right) => !left.Equals(right);
/// <summary>
/// Multiply all elements by a given <see cref="int"/>
@ -149,34 +132,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
return result;
}
/// <summary>
/// Pointer-based "Indexer" (getter part)
/// </summary>
/// <param name="blockPtr">Block pointer</param>
/// <param name="idx">Index</param>
/// <returns>The scaleVec value at the specified index</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static short GetScalarAt(Block8x8* blockPtr, int idx)
{
GuardBlockIndex(idx);
short* fp = blockPtr->data;
return fp[idx];
}
/// <summary>
/// Pointer-based "Indexer" (setter part)
/// </summary>
/// <param name="blockPtr">Block pointer</param>
/// <param name="idx">Index</param>
/// <param name="value">Value</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void SetScalarAt(Block8x8* blockPtr, int idx, short value)
public static Block8x8 Load(Span<short> data)
{
GuardBlockIndex(idx);
short* fp = blockPtr->data;
fp[idx] = value;
Block8x8 result = default;
result.LoadFrom(data);
return result;
}
/// <summary>
@ -194,7 +154,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
/// </summary>
public short[] ToArray()
{
var result = new short[Size];
short[] result = new short[Size];
this.CopyTo(result);
return result;
}
@ -220,6 +180,19 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
}
}
/// <summary>
/// Load raw 16bit integers from source.
/// </summary>
/// <param name="source">Source</param>
[MethodImpl(InliningOptions.ShortMethod)]
public void LoadFrom(Span<short> source)
{
ref byte s = ref Unsafe.As<short, byte>(ref MemoryMarshal.GetReference(source));
ref byte d = ref Unsafe.As<Block8x8, byte>(ref this);
Unsafe.CopyBlock(ref d, ref s, Size * sizeof(short));
}
/// <summary>
/// Cast and copy <see cref="Size"/> <see cref="int"/>-s from the beginning of 'source' span.
/// </summary>
@ -271,16 +244,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
}
/// <inheritdoc />
public override bool Equals(object obj)
{
return obj is Block8x8 other && this.Equals(other);
}
public override bool Equals(object obj) => obj is Block8x8 other && this.Equals(other);
/// <inheritdoc />
public override int GetHashCode()
{
return (this[0] * 31) + this[1];
}
public override int GetHashCode() => (this[0] * 31) + this[1];
/// <summary>
/// Calculate the total sum of absolute differences of elements in 'a' and 'b'.

4
tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
View File

@ -462,7 +462,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
short[] data = Create8x8ShortData();
var source = new Block8x8(data);
var source = Block8x8.Load(data);
Block8x8F dest = default;
dest.LoadFromInt16Scalar(ref source);
@ -483,7 +483,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
short[] data = Create8x8ShortData();
var source = new Block8x8(data);
var source = Block8x8.Load(data);
Block8x8F dest = default;
dest.LoadFromInt16ExtendedAvx2(ref source);

38
tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs
View File

@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
{
short[] data = Create8x8ShortData();
var block = new Block8x8(data);
var block = Block8x8.Load(data);
for (int i = 0; i < Block8x8.Size; i++)
{
@ -43,32 +43,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Assert.Equal(42, block[42]);
}
[Fact]
public unsafe void Indexer_GetScalarAt_SetScalarAt()
{
int sum;
var block = default(Block8x8);
for (int i = 0; i < Block8x8.Size; i++)
{
Block8x8.SetScalarAt(&block, i, (short)i);
}
sum = 0;
for (int i = 0; i < Block8x8.Size; i++)
{
sum += Block8x8.GetScalarAt(&block, i);
}
Assert.Equal(sum, 64 * 63 / 2);
}
[Fact]
public void AsFloatBlock()
{
short[] data = Create8x8ShortData();
var source = new Block8x8(data);
var source = Block8x8.Load(data);
Block8x8F dest = source.AsFloatBlock();
@ -82,7 +62,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public void ToArray()
{
short[] data = Create8x8ShortData();
var block = new Block8x8(data);
var block = Block8x8.Load(data);
short[] result = block.ToArray();
@ -93,8 +73,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public void Equality_WhenTrue()
{
short[] data = Create8x8ShortData();
var block1 = new Block8x8(data);
var block2 = new Block8x8(data);
var block1 = Block8x8.Load(data);
var block2 = Block8x8.Load(data);
block1[0] = 42;
block2[0] = 42;
@ -107,8 +87,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public void Equality_WhenFalse()
{
short[] data = Create8x8ShortData();
var block1 = new Block8x8(data);
var block2 = new Block8x8(data);
var block1 = Block8x8.Load(data);
var block2 = Block8x8.Load(data);
block1[0] = 42;
block2[0] = 666;
@ -131,8 +111,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public void TotalDifference()
{
short[] data = Create8x8ShortData();
var block1 = new Block8x8(data);
var block2 = new Block8x8(data);
var block1 = Block8x8.Load(data);
var block2 = Block8x8.Load(data);
block2[10] += 7;
block2[63] += 8;

2
tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
View File

@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
{
this.MinVal = Math.Min(this.MinVal, data.Min());
this.MaxVal = Math.Max(this.MaxVal, data.Max());
this.SpectralBlocks[x, y] = new Block8x8(data);
this.SpectralBlocks[x, y] = Block8x8.Load(data);
}
public void LoadSpectralStride(Buffer2D<Block8x8> data, int strideIndex)

Write Preview
Loading…
Cancel
Save