From 3c026f7bf9772f269b5eabed4624bc3d6a6aa847 Mon Sep 17 00:00:00 2001 From: dirk Date: Sat, 29 Oct 2016 23:45:12 +0200 Subject: [PATCH] Resolved SA1110, SA1117, SA1210 and SA1500. --- src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs | 6 ++++-- src/ImageSharp/Formats/Png/PngEncoderCore.cs | 2 +- src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs | 4 ++-- src/ImageSharp/IO/EndianBinaryReader.cs | 3 +-- src/ImageSharp/Profiles/Exif/ExifReader.cs | 3 +-- src/ImageSharp/Properties/AssemblyInfo.cs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs index f26faf2f5f..acc65769a6 100644 --- a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs @@ -49,7 +49,8 @@ namespace ImageSharp.Formats /// The values are derived from section K.1 after converting from natural to /// zig-zag order. /// - private readonly byte[,] unscaledQuant = { + private readonly byte[,] unscaledQuant = + { { // Luminance. 16, 11, 12, 14, 12, 10, 16, 14, 13, 14, 18, 17, 16, 19, 24, 40, @@ -71,7 +72,8 @@ namespace ImageSharp.Formats /// The Huffman encoding specifications. /// This encoder uses the same Huffman encoding for all images. /// - private readonly HuffmanSpec[] theHuffmanSpec = { + private readonly HuffmanSpec[] theHuffmanSpec = + { // Luminance DC. new HuffmanSpec( new byte[] diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs index 0915000c46..13aa1f4b1f 100644 --- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs +++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs @@ -611,7 +611,7 @@ namespace ImageSharp.Formats /// The stream. private void WriteDataChunks(Stream stream) { - byte[] data = this.EncodePixelData(); + byte[] data = this.EncodePixelData(); byte[] buffer; int bufferLength; diff --git a/src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs b/src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs index e411396d0d..9245cfe834 100644 --- a/src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs +++ b/src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs @@ -184,8 +184,8 @@ namespace ImageSharp.Formats this.deflateStream.Dispose(); this.deflateStream = null; } - else { - + else + { // Hack: empty input? this.rawStream.WriteByte(3); this.rawStream.WriteByte(0); diff --git a/src/ImageSharp/IO/EndianBinaryReader.cs b/src/ImageSharp/IO/EndianBinaryReader.cs index 2ee577418d..c635fedb6d 100644 --- a/src/ImageSharp/IO/EndianBinaryReader.cs +++ b/src/ImageSharp/IO/EndianBinaryReader.cs @@ -575,8 +575,7 @@ namespace ImageSharp.IO int read = this.BaseStream.Read(data, index, size - index); if (read == 0) { - throw new EndOfStreamException - ( + throw new EndOfStreamException( string.Format( "End of stream reached with {0} byte{1} left to read.", size - index, diff --git a/src/ImageSharp/Profiles/Exif/ExifReader.cs b/src/ImageSharp/Profiles/Exif/ExifReader.cs index 6fcf95e1af..4a60991577 100644 --- a/src/ImageSharp/Profiles/Exif/ExifReader.cs +++ b/src/ImageSharp/Profiles/Exif/ExifReader.cs @@ -361,8 +361,7 @@ namespace ImageSharp } } - private static TDataType[] ToArray(ExifDataType dataType, byte[] data, - ConverterMethod converter) + private static TDataType[] ToArray(ExifDataType dataType, byte[] data, ConverterMethod converter) { int dataTypeSize = (int)ExifValue.GetSize(dataType); int length = data.Length / dataTypeSize; diff --git a/src/ImageSharp/Properties/AssemblyInfo.cs b/src/ImageSharp/Properties/AssemblyInfo.cs index e09dd594df..fd8e0349bf 100644 --- a/src/ImageSharp/Properties/AssemblyInfo.cs +++ b/src/ImageSharp/Properties/AssemblyInfo.cs @@ -3,8 +3,8 @@ // Licensed under the Apache License, Version 2.0. // -using System.Resources; using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; // General Information about an assembly is controlled through the following