Browse Source

Silence warnings.

af/merge-core
Dirk Lemstra 9 years ago
parent
commit
534a7452d0
  1. 8
      src/ImageSharp/Common/Helpers/ImageMaths.cs
  2. 2
      src/ImageSharp/PixelFormats/HalfSingle.cs
  3. 10
      src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs
  4. 4
      src/ImageSharp/PixelFormats/Rgba32.cs
  5. 46
      tests/ImageSharp.Tests/ConfigurationTests.cs
  6. 32
      tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
  7. 8
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  8. 10
      tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

8
src/ImageSharp/Common/Helpers/ImageMaths.cs

@ -128,10 +128,10 @@ namespace SixLabors.ImageSharp
/// </returns> /// </returns>
public static Rectangle GetBoundingRectangle(Rectangle rectangle, Matrix3x2 matrix) public static Rectangle GetBoundingRectangle(Rectangle rectangle, Matrix3x2 matrix)
{ {
Vector2 leftTop = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Top), matrix); var leftTop = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Top), matrix);
Vector2 rightTop = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Top), matrix); var rightTop = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Top), matrix);
Vector2 leftBottom = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Bottom), matrix); var leftBottom = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Bottom), matrix);
Vector2 rightBottom = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Bottom), matrix); var rightBottom = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Bottom), matrix);
Vector2[] allCorners = { leftTop, rightTop, leftBottom, rightBottom }; Vector2[] allCorners = { leftTop, rightTop, leftBottom, rightBottom };
float extentX = allCorners.Select(v => v.X).Max() - allCorners.Select(v => v.X).Min(); float extentX = allCorners.Select(v => v.X).Max() - allCorners.Select(v => v.X).Min();

2
src/ImageSharp/PixelFormats/HalfSingle.cs

@ -178,7 +178,7 @@ namespace SixLabors.ImageSharp.PixelFormats
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private Vector4 ToScaledVector4() private Vector4 ToScaledVector4()
{ {
Vector4 vector = this.ToVector4(); var vector = this.ToVector4();
vector *= MaxBytes; vector *= MaxBytes;
vector += Half; vector += Half;
vector = Vector4.Clamp(vector, Vector4.Zero, MaxBytes); vector = Vector4.Clamp(vector, Vector4.Zero, MaxBytes);

10
src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs

@ -50,10 +50,10 @@ namespace SixLabors.ImageSharp
nameof(count), nameof(count),
"Argument 'count' should divisible by Vector<uint>.Count!"); "Argument 'count' should divisible by Vector<uint>.Count!");
Vector<float> bVec = new Vector<float>(256.0f / 255.0f); var bVec = new Vector<float>(256.0f / 255.0f);
Vector<float> magicFloat = new Vector<float>(32768.0f); var magicFloat = new Vector<float>(32768.0f);
Vector<uint> magicInt = new Vector<uint>(1191182336); // reinterpreded value of 32768.0f var magicInt = new Vector<uint>(1191182336); // reinterpreded value of 32768.0f
Vector<uint> mask = new Vector<uint>(255); var mask = new Vector<uint>(255);
int unpackedRawCount = count * 4; int unpackedRawCount = count * 4;
@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp
vi &= mask; vi &= mask;
vi |= magicInt; vi |= magicInt;
Vector<float> vf = Vector.AsVectorSingle(vi); var vf = Vector.AsVectorSingle(vi);
vf = (vf - magicFloat) * bVec; vf = (vf - magicFloat) * bVec;
Unsafe.Add(ref destBaseAsFloat, i) = vf; Unsafe.Add(ref destBaseAsFloat, i) = vf;

4
src/ImageSharp/PixelFormats/Rgba32.cs

@ -429,7 +429,7 @@ namespace SixLabors.ImageSharp
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void Pack(float x, float y, float z, float w) private void Pack(float x, float y, float z, float w)
{ {
Vector4 value = new Vector4(x, y, z, w); var value = new Vector4(x, y, z, w);
this.Pack(ref value); this.Pack(ref value);
} }
@ -440,7 +440,7 @@ namespace SixLabors.ImageSharp
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void Pack(ref Vector3 vector) private void Pack(ref Vector3 vector)
{ {
Vector4 value = new Vector4(vector, 1); var value = new Vector4(vector, 1);
this.Pack(ref value); this.Pack(ref value);
} }

46
tests/ImageSharp.Tests/ConfigurationTests.cs

@ -30,15 +30,15 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void DefaultsToLocalFileSystem() public void DefaultsToLocalFileSystem()
{ {
Assert.IsType<LocalFileSystem>(DefaultConfiguration.FileSystem); Assert.IsType<LocalFileSystem>(this.DefaultConfiguration.FileSystem);
Assert.IsType<LocalFileSystem>(ConfigurationEmpty.FileSystem); Assert.IsType<LocalFileSystem>(this.ConfigurationEmpty.FileSystem);
} }
[Fact] [Fact]
public void IfAutoloadWellknwonFormatesIsTrueAllFormateAreLoaded() public void IfAutoloadWellknwonFormatesIsTrueAllFormateAreLoaded()
{ {
Assert.Equal(4, DefaultConfiguration.ImageEncoders.Count()); Assert.Equal(4, this.DefaultConfiguration.ImageEncoders.Count());
Assert.Equal(4, DefaultConfiguration.ImageDecoders.Count()); Assert.Equal(4, this.DefaultConfiguration.ImageDecoders.Count());
} }
/// <summary> /// <summary>
@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Tests
{ {
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.AddImageFormatDetector(null); this.DefaultConfiguration.AddImageFormatDetector(null);
}); });
} }
@ -83,15 +83,15 @@ namespace SixLabors.ImageSharp.Tests
{ {
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetEncoder(null, new Mock<IImageEncoder>().Object); this.DefaultConfiguration.SetEncoder(null, new Mock<IImageEncoder>().Object);
}); });
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetEncoder(ImageFormats.Bmp, null); this.DefaultConfiguration.SetEncoder(ImageFormats.Bmp, null);
}); });
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetEncoder(null, null); this.DefaultConfiguration.SetEncoder(null, null);
}); });
} }
@ -100,29 +100,29 @@ namespace SixLabors.ImageSharp.Tests
{ {
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetDecoder(null, new Mock<IImageDecoder>().Object); this.DefaultConfiguration.SetDecoder(null, new Mock<IImageDecoder>().Object);
}); });
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetDecoder(ImageFormats.Bmp, null); this.DefaultConfiguration.SetDecoder(ImageFormats.Bmp, null);
}); });
Assert.Throws<ArgumentNullException>(() => Assert.Throws<ArgumentNullException>(() =>
{ {
DefaultConfiguration.SetDecoder(null, null); this.DefaultConfiguration.SetDecoder(null, null);
}); });
} }
[Fact] [Fact]
public void RegisterMimeTypeEncoderReplacesLast() public void RegisterMimeTypeEncoderReplacesLast()
{ {
var encoder1 = new Mock<IImageEncoder>().Object; IImageEncoder encoder1 = new Mock<IImageEncoder>().Object;
ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder1); this.ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder1);
var found = ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat); IImageEncoder found = this.ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat);
Assert.Equal(encoder1, found); Assert.Equal(encoder1, found);
var encoder2 = new Mock<IImageEncoder>().Object; IImageEncoder encoder2 = new Mock<IImageEncoder>().Object;
ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder2); this.ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder2);
var found2 = ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat); IImageEncoder found2 = this.ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat);
Assert.Equal(encoder2, found2); Assert.Equal(encoder2, found2);
Assert.NotEqual(found, found2); Assert.NotEqual(found, found2);
} }
@ -130,14 +130,14 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void RegisterMimeTypeDecoderReplacesLast() public void RegisterMimeTypeDecoderReplacesLast()
{ {
var decoder1 = new Mock<IImageDecoder>().Object; IImageDecoder decoder1 = new Mock<IImageDecoder>().Object;
ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder1); this.ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder1);
var found = ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat); IImageDecoder found = this.ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat);
Assert.Equal(decoder1, found); Assert.Equal(decoder1, found);
var decoder2 = new Mock<IImageDecoder>().Object; IImageDecoder decoder2 = new Mock<IImageDecoder>().Object;
ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder2); this.ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder2);
var found2 = ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat); IImageDecoder found2 = this.ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat);
Assert.Equal(decoder2, found2); Assert.Equal(decoder2, found2);
Assert.NotEqual(found, found2); Assert.NotEqual(found, found2);
} }

32
tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Times, Times,
() => () =>
{ {
Block8x8F block = new Block8x8F(); var block = new Block8x8F();
for (int i = 0; i < Block8x8F.Size; i++) for (int i = 0; i < Block8x8F.Size; i++)
{ {
@ -64,7 +64,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Times, Times,
() => () =>
{ {
Block8x8F block = new Block8x8F(); var block = new Block8x8F();
for (int i = 0; i < Block8x8F.Size; i++) for (int i = 0; i < Block8x8F.Size; i++)
{ {
@ -120,7 +120,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Times, Times,
() => () =>
{ {
Block8x8F b = new Block8x8F(); var b = new Block8x8F();
b.LoadFrom(data); b.LoadFrom(data);
b.CopyTo(mirror); b.CopyTo(mirror);
}); });
@ -145,7 +145,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Times, Times,
() => () =>
{ {
Block8x8F b = new Block8x8F(); var b = new Block8x8F();
Block8x8F.LoadFrom(&b, data); Block8x8F.LoadFrom(&b, data);
Block8x8F.CopyTo(&b, mirror); Block8x8F.CopyTo(&b, mirror);
}); });
@ -170,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Times, Times,
() => () =>
{ {
Block8x8F v = new Block8x8F(); var v = new Block8x8F();
v.LoadFrom(data); v.LoadFrom(data);
v.CopyTo(mirror); v.CopyTo(mirror);
}); });
@ -186,10 +186,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
float[] expected = Create8x8FloatData(); float[] expected = Create8x8FloatData();
ReferenceImplementations.Transpose8x8(expected); ReferenceImplementations.Transpose8x8(expected);
Block8x8F source = new Block8x8F(); var source = new Block8x8F();
source.LoadFrom(Create8x8FloatData()); source.LoadFrom(Create8x8FloatData());
Block8x8F dest = new Block8x8F(); var dest = new Block8x8F();
source.TransposeInto(ref dest); source.TransposeInto(ref dest);
float[] actual = new float[64]; float[] actual = new float[64];
@ -206,12 +206,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Fact] [Fact]
public void TranposeInto_Benchmark() public void TranposeInto_Benchmark()
{ {
BufferHolder source = new BufferHolder(); var source = new BufferHolder();
source.Buffer.LoadFrom(Create8x8FloatData()); source.Buffer.LoadFrom(Create8x8FloatData());
BufferHolder dest = new BufferHolder(); var dest = new BufferHolder();
this.Output.WriteLine($"TranposeInto_PinningImpl_Benchmark X {Times} ..."); this.Output.WriteLine($"TranposeInto_PinningImpl_Benchmark X {Times} ...");
Stopwatch sw = Stopwatch.StartNew(); var sw = Stopwatch.StartNew();
for (int i = 0; i < Times; i++) for (int i = 0; i < Times; i++)
{ {
@ -226,7 +226,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public unsafe void CopyColorsTo() public unsafe void CopyColorsTo()
{ {
float[] data = Create8x8FloatData(); float[] data = Create8x8FloatData();
Block8x8F block = new Block8x8F(); var block = new Block8x8F();
block.LoadFrom(data); block.LoadFrom(data);
block.MultiplyAllInplace(5); block.MultiplyAllInplace(5);
@ -237,7 +237,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
byte[] colorsExpected = new byte[stride * height]; byte[] colorsExpected = new byte[stride * height];
byte[] colorsActual = new byte[stride * height]; byte[] colorsActual = new byte[stride * height];
Block8x8F temp = new Block8x8F(); var temp = new Block8x8F();
ReferenceImplementations.CopyColorsTo(ref block, new Span<byte>(colorsExpected, offset), stride); ReferenceImplementations.CopyColorsTo(ref block, new Span<byte>(colorsExpected, offset), stride);
@ -303,18 +303,18 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[InlineData(2)] [InlineData(2)]
public unsafe void UnzigDivRound(int seed) public unsafe void UnzigDivRound(int seed)
{ {
Block8x8F block = new Block8x8F(); var block = new Block8x8F();
block.LoadFrom(Create8x8RoundedRandomFloatData(-2000, 2000, seed)); block.LoadFrom(Create8x8RoundedRandomFloatData(-2000, 2000, seed));
Block8x8F qt = new Block8x8F(); var qt = new Block8x8F();
qt.LoadFrom(Create8x8RoundedRandomFloatData(-2000, 2000, seed)); qt.LoadFrom(Create8x8RoundedRandomFloatData(-2000, 2000, seed));
UnzigData unzig = UnzigData.Create(); var unzig = UnzigData.Create();
int* expectedResults = stackalloc int[Block8x8F.Size]; int* expectedResults = stackalloc int[Block8x8F.Size];
ReferenceImplementations.UnZigDivRoundRational(&block, expectedResults, &qt, unzig.Data); ReferenceImplementations.UnZigDivRoundRational(&block, expectedResults, &qt, unzig.Data);
Block8x8F actualResults = default(Block8x8F); var actualResults = default(Block8x8F);
Block8x8F.UnzigDivRound(&block, &actualResults, &qt, unzig.Data); Block8x8F.UnzigDivRound(&block, &actualResults, &qt, unzig.Data);

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

@ -280,12 +280,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Fact] [Fact]
public void Decode_IgnoreMetadataIsFalse_ExifProfileIsRead() public void Decode_IgnoreMetadataIsFalse_ExifProfileIsRead()
{ {
JpegDecoder decoder = new JpegDecoder() var decoder = new JpegDecoder()
{ {
IgnoreMetadata = false IgnoreMetadata = false
}; };
TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan); var testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
using (Image<Rgba32> image = testFile.CreateImage(decoder)) using (Image<Rgba32> image = testFile.CreateImage(decoder))
{ {
@ -296,12 +296,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Fact] [Fact]
public void Decode_IgnoreMetadataIsTrue_ExifProfileIgnored() public void Decode_IgnoreMetadataIsTrue_ExifProfileIgnored()
{ {
JpegDecoder options = new JpegDecoder() var options = new JpegDecoder()
{ {
IgnoreMetadata = true IgnoreMetadata = true
}; };
TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan); var testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
using (Image<Rgba32> image = testFile.CreateImage(options)) using (Image<Rgba32> image = testFile.CreateImage(options))
{ {

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

@ -28,10 +28,10 @@ namespace SixLabors.ImageSharp.Tests
{ {
using (Image<TPixel> image = provider.GetImage()) using (Image<TPixel> image = provider.GetImage())
{ {
PngEncoder options = new PngEncoder() var options = new PngEncoder()
{ {
PngColorType = pngColorType PngColorType = pngColorType
}; };
provider.Utility.TestName += "_" + pngColorType; provider.Utility.TestName += "_" + pngColorType;
provider.Utility.SaveTestOutputFile(image, "png", options); provider.Utility.SaveTestOutputFile(image, "png", options);
@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Tests
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
using (Image<TPixel> image = provider.GetImage()) using (Image<TPixel> image = provider.GetImage())
using (MemoryStream ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {
image.Save(ms, new PngEncoder()); image.Save(ms, new PngEncoder());

Loading…
Cancel
Save