remove SharpZipLib, no longer used for sqpack decompression

NotAdam · Feb 22, 2020 · a6d63ac · a6d63ac
1 parent 2aa7ad7
commit a6d63ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Lumina/Data/Files/TexFile.cs b/Lumina/Data/Files/TexFile.cs
@@ -8,7 +8,6 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using ICSharpCode.SharpZipLib.Tar;
 using Lumina.Data.Parsing.Tex;
 using Lumina.Extensions;
 

diff --git a/Lumina/Data/SqPack.cs b/Lumina/Data/SqPack.cs
@@ -3,8 +3,7 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
-using System.Threading;
-using ICSharpCode.SharpZipLib.Zip.Compression;
+using System.IO.Compression;
 using Lumina.Data.Structs;
 using Lumina.Extensions;
 
@@ -86,7 +85,7 @@ protected T GetCachedFile< T >( long offset ) where T : FileResource
             {
                 return null;
             }
-            
+
             // only return from cache if target type matches
             // otherwise we'll force a cache miss and parse it as per usual
             if( cachedFile is T obj )
@@ -117,7 +116,7 @@ public T ReadFile< T >( long offset ) where T : FileResource
                     return obj;
                 }
             }
-            
+
             using var fs = File.OpenRead();
             using var br = new BinaryReader( fs );
             using var ms = new MemoryStream();
@@ -182,7 +181,7 @@ public T ReadFile< T >( long offset ) where T : FileResource
             file.Data = ms.ToArray();
             if( file.Data.Length != file.FileInfo.RawFileSize )
                 Debug.WriteLine( "Read data size does not match file size." );
-            
+
             file.FileStream = new MemoryStream( file.Data, false );
             file.Reader = new BinaryReader( file.FileStream );
             file.FileStream.Position = 0;
@@ -348,18 +347,21 @@ protected void ReadFileBlock( long offset, FileStream fs, BinaryReader br, Memor
             if( blockHeader.compressed_size == 32000 )
             {
                 dest.Write( br.ReadBytes( (int)blockHeader.uncompressed_size ) );
-
                 return;
             }
 
             var data = br.ReadBytes( (int)blockHeader.uncompressed_size );
 
-            var inflater = new Inflater( true );
-
-            inflater.SetInput( data );
-            var bytesInflated = inflater.Inflate( data );
-
-            dest.Write( data );
+            var uncompressedData = new MemoryStream();
+            using( var compressedStream = new MemoryStream( data ) )
+            {
+                using var zlibStream = new DeflateStream( compressedStream, CompressionMode.Decompress );
+                zlibStream.CopyTo( uncompressedData );
+                zlibStream.Close();
+
+                uncompressedData.Position = 0;
+                uncompressedData.CopyTo( dest );
+            }
 
             if( resetPosition )
                 fs.Position = originalPosition;

diff --git a/Lumina/Lumina.csproj b/Lumina/Lumina.csproj
@@ -8,7 +8,7 @@
         <PackageProjectUrl>https://github.com/NotAdam/Lumina</PackageProjectUrl>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/NotAdam/Lumina</RepositoryUrl>
-        <PackageVersion>1.0.0-preview10</PackageVersion>
+        <PackageVersion>1.0.0</PackageVersion>
         <Description>Lumina is a small, performant and simple library for interacting with FINAL FANTASY XIV game data.</Description>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
@@ -18,7 +18,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="SharpZipLib" Version="1.2.0" />
       <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
     </ItemGroup>