Skip to content

Commit

Permalink
- SharpZipLib Added as NuGet package
Browse files Browse the repository at this point in the history
  • Loading branch information
phusband committed Dec 12, 2015
1 parent 5d664cb commit 1f8ae91
Show file tree
Hide file tree
Showing 26 changed files with 15 additions and 11,312 deletions.
30 changes: 7 additions & 23 deletions PiaNO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
Expand All @@ -40,28 +44,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Zip\Checksums\Adler32.cs" />
<Compile Include="Zip\Checksums\Crc32.cs" />
<Compile Include="Zip\Checksums\IChecksum.cs" />
<Compile Include="Zip\Compression\Deflater.cs" />
<Compile Include="Zip\Compression\DeflaterEngine.cs" />
<Compile Include="Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="Zip\Compression\DeflaterPending.cs" />
<Compile Include="Zip\Compression\DeflatorConstants.cs" />
<Compile Include="Zip\Compression\Inflater.cs" />
<Compile Include="Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="Zip\Compression\PendingBuffer.cs" />
<Compile Include="Zip\Streams\DeflatorOutputStream.cs" />
<Compile Include="Zip\Streams\OutputWindow.cs" />
<Compile Include="Zip\Streams\StreamManipulator.cs" />
<Compile Include="Zip\ZipConstants.cs" />
<Compile Include="Zip\ZipEntry.cs" />
<Compile Include="Zip\ZipException.cs" />
<Compile Include="Zip\ZipExtraData.cs" />
<Compile Include="Zip\ZipHelperStream.cs" />
<Compile Include="Zip\Encryption\PkzipClassic.cs" />
<Compile Include="Zip\Encryption\ZipAESTransform.cs" />
<Compile Include="PiaNode.cs" />
<Compile Include="PiaException.cs" />
<Compile Include="Plot\ColorDependentPlotStyleTable.cs" />
Expand All @@ -79,7 +61,9 @@
<Compile Include="Plot\PlotterModelParameters.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Serialization\PiaSerializer.cs" />
<Compile Include="Zip\Streams\InflaterInputStream.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
8 changes: 4 additions & 4 deletions Serialization/PiaSerializer.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
//
// Copyright © 2014 Parrish Husband (parrish.husband@gmail.com)
// Copyright © 2015 Parrish Husband (parrish.husband@gmail.com)
// The MIT License (MIT) - See LICENSE.txt for further details.
//

using ICSharpCode.SharpZipLib.Zip.Compression;
using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using PiaNO.Zip.Checksums;
using PiaNO.Zip.Compression;
using PiaNO.Zip.Streams;

namespace PiaNO.Serialization
{
Expand All @@ -35,6 +34,7 @@ public static void Deserialize(Stream stream, PiaFile piaFile)
// Inflation
string inflatedString;
stream.Seek(60, SeekOrigin.Begin);

using (var zStream = new InflaterInputStream(stream))
{
var sr = new StreamReader(zStream, Encoding.Default);
Expand Down
245 changes: 0 additions & 245 deletions Zip/Checksums/Adler32.cs

This file was deleted.

Loading

0 comments on commit 1f8ae91

Please sign in to comment.