From 816194f1281728b4c49b136001419e29cc3d96f2 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Mon, 22 Jan 2018 17:24:35 +0400
Subject: [PATCH] added #ZipLib reference for BZip2InputStream support.

DonNetZip bzip2 decompressor fails when input stream contains trailing
garbage.
---
 ArcFormats/ArcFormats.csproj | 4 ++++
 ArcFormats/Tamamo/ArcPCK.cs  | 3 ++-
 ArcFormats/packages.config   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index f8479635..053f64b9 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -49,6 +49,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\SharpZipLib.1.0.0-alpha2\lib\netstandard1.3\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="NAudio">
       <HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
     </Reference>
diff --git a/ArcFormats/Tamamo/ArcPCK.cs b/ArcFormats/Tamamo/ArcPCK.cs
index 27940a0a..d46f56ee 100644
--- a/ArcFormats/Tamamo/ArcPCK.cs
+++ b/ArcFormats/Tamamo/ArcPCK.cs
@@ -33,6 +33,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using GameRes.Cryptography;
 using GameRes.Formats.Strings;
+using ICSharpCode.SharpZipLib.BZip2;
 
 namespace GameRes.Formats.Tamamo
 {
@@ -126,7 +127,7 @@ namespace GameRes.Formats.Tamamo
                 }
                 else
                 {
-//                    input = new Bzip2InputStream (input); // requires #ZipLib/DonNetZip
+                    input = new BZip2InputStream (input);
                 }
             }
             return input;
diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config
index cec6c928..277c5f0d 100644
--- a/ArcFormats/packages.config
+++ b/ArcFormats/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NVorbis" version="0.8.5.0" targetFramework="net46" />
+  <package id="SharpZipLib" version="1.0.0-alpha2" targetFramework="net46" />
 </packages>
\ No newline at end of file