From c2c16d339997f30656d7cc5fcf4104a6f323db72 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 22 Jan 2016 10:45:44 +1100 Subject: [PATCH] Build fixes. Former-commit-id: 8ac15c0d0641c76a18f468f7477569655a7f8f63 Former-commit-id: e4b2b6b3cc933fd4d6b7471d1856f21ea4b58cdd Former-commit-id: 25af02845e2ca3d08b34c1638fb5566c17fbd082 --- src/ImageProcessor/Formats/Png/PngDecoderCore.cs | 2 +- src/ImageProcessor/Formats/Png/PngEncoder.cs | 4 ++-- src/ImageProcessor/Formats/Png/PngHeader.cs | 2 +- src/ImageProcessor/Formats/Png/Zlib/Adler32.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs b/src/ImageProcessor/Formats/Png/PngDecoderCore.cs index 6ecbe5a86..a75eadabe 100644 --- a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs +++ b/src/ImageProcessor/Formats/Png/PngDecoderCore.cs @@ -250,7 +250,7 @@ namespace ImageProcessor.Formats byte[] currentScanline = new byte[scanlineLength]; int filter = 0, column = -1; - using (ZlibInputStream compressedStream = new ZlibInputStream(dataStream)) + using (ZlibInflateStream compressedStream = new ZlibInflateStream(dataStream)) { int readByte; while ((readByte = compressedStream.ReadByte()) >= 0) diff --git a/src/ImageProcessor/Formats/Png/PngEncoder.cs b/src/ImageProcessor/Formats/Png/PngEncoder.cs index 850cb5ee0..efb3b1ef4 100644 --- a/src/ImageProcessor/Formats/Png/PngEncoder.cs +++ b/src/ImageProcessor/Formats/Png/PngEncoder.cs @@ -263,9 +263,9 @@ namespace ImageProcessor.Formats { memoryStream = new MemoryStream(); - using (ZlibOutputStream outputStream = new ZlibOutputStream(memoryStream, this.CompressionLevel)) + using (ZlibDeflateStream deflateStream = new ZlibDeflateStream(memoryStream, this.CompressionLevel)) { - outputStream.Write(data, 0, data.Length); + deflateStream.Write(data, 0, data.Length); } bufferLength = (int)memoryStream.Length; diff --git a/src/ImageProcessor/Formats/Png/PngHeader.cs b/src/ImageProcessor/Formats/Png/PngHeader.cs index 9b7eacc2f..dd0a9b116 100644 --- a/src/ImageProcessor/Formats/Png/PngHeader.cs +++ b/src/ImageProcessor/Formats/Png/PngHeader.cs @@ -8,7 +8,7 @@ namespace ImageProcessor.Formats /// /// Represents the png header chunk. /// - internal sealed class PngHeader + public sealed class PngHeader { /// /// Gets or sets the dimension in x-direction of the image in pixels. diff --git a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs b/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs index 25bc74853..ae0d05069 100644 --- a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs +++ b/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs @@ -52,8 +52,8 @@ namespace ImageProcessor.Formats /// checked separately. (Any sequence of zeroes has a Fletcher /// checksum of zero.)" /// - /// - /// + /// + /// internal sealed class Adler32 : IChecksum { ///