Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to .NET native DeflateStream for huge performance improvements #93

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to .NET native DeflateStream for huge performance improvements #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions src/PdfSharp-gdi/PdfSharp-gdi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,63 +1139,6 @@
<Compile Include="..\PdfSharp\root\VersionInfo.cs">
<Link>root\VersionInfo.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\Adler32.cs">
<Link>SharpZipLib\Checksums\Adler32.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\CRC32.cs">
<Link>SharpZipLib\Checksums\CRC32.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\IChecksum.cs">
<Link>SharpZipLib\Checksums\IChecksum.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\SharpZipBaseException.cs">
<Link>SharpZipLib\SharpZipBaseException.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Deflater.cs">
<Link>SharpZipLib\Zip\Compression\Deflater.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterConstants.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterConstants.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterEngine.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterEngine.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterHuffman.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterHuffman.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterPending.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterPending.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Inflater.cs">
<Link>SharpZipLib\Zip\Compression\Inflater.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\InflaterDynHeader.cs">
<Link>SharpZipLib\Zip\Compression\InflaterDynHeader.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs">
<Link>SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\PendingBuffer.cs">
<Link>SharpZipLib\Zip\Compression\PendingBuffer.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs">
<Link>SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs">
<Link>SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\OutputWindow.cs">
<Link>SharpZipLib\Zip\Compression\Streams\OutputWindow.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs">
<Link>SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\ZipConstants.cs">
<Link>SharpZipLib\Zip\ZipConstants.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\ZipException.cs">
<Link>SharpZipLib\Zip\ZipException.cs</Link>
</Compile>
<EmbeddedResource Include="..\PdfSharp\Forms\PagePreview.resx">
<Link>Forms\PagePreview.resx</Link>
<DependentUpon>PagePreview.cs</DependentUpon>
Expand Down Expand Up @@ -1243,12 +1186,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\images\" />
<Folder Include="SharpZipLib\SharpZip\" />
</ItemGroup>
<ItemGroup>
<Content Include="..\PdfSharp\SharpZipLib\ReadMe.txt">
<Link>SharpZipLib\ReadMe.txt</Link>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand Down
62 changes: 0 additions & 62 deletions src/PdfSharp-wpf/PdfSharp-wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,63 +1084,6 @@
<Compile Include="..\PdfSharp\root\VersionInfo.cs">
<Link>root\VersionInfo.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\Adler32.cs">
<Link>SharpZipLib\Checksums\Adler32.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\CRC32.cs">
<Link>SharpZipLib\Checksums\CRC32.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Checksums\IChecksum.cs">
<Link>SharpZipLib\Checksums\IChecksum.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\SharpZipBaseException.cs">
<Link>SharpZipLib\SharpZipBaseException.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Deflater.cs">
<Link>SharpZipLib\Zip\Compression\Deflater.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterConstants.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterConstants.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterEngine.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterEngine.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterHuffman.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterHuffman.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\DeflaterPending.cs">
<Link>SharpZipLib\Zip\Compression\DeflaterPending.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Inflater.cs">
<Link>SharpZipLib\Zip\Compression\Inflater.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\InflaterDynHeader.cs">
<Link>SharpZipLib\Zip\Compression\InflaterDynHeader.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs">
<Link>SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\PendingBuffer.cs">
<Link>SharpZipLib\Zip\Compression\PendingBuffer.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs">
<Link>SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs">
<Link>SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\OutputWindow.cs">
<Link>SharpZipLib\Zip\Compression\Streams\OutputWindow.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs">
<Link>SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\ZipConstants.cs">
<Link>SharpZipLib\Zip\ZipConstants.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\SharpZipLib\Zip\ZipException.cs">
<Link>SharpZipLib\Zip\ZipException.cs</Link>
</Compile>
<Compile Include="..\PdfSharp\Windows\enums\RenderMode.cs">
<Link>Windows\enums\RenderMode.cs</Link>
</Compile>
Expand Down Expand Up @@ -1183,11 +1126,6 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="..\PdfSharp\SharpZipLib\ReadMe.txt">
<Link>SharpZipLib\ReadMe.txt</Link>
</Content>
</ItemGroup>
<ItemGroup>
<Page Include="Windows\PagePreview.xaml">
<Generator>MSBuild:Compile</Generator>
Expand Down
25 changes: 23 additions & 2 deletions src/PdfSharp/Pdf.Filters/FlateDecode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#endregion

#define NET_ZIP
using System;
using System.IO;
using PdfSharp.Internal;
Expand Down Expand Up @@ -126,11 +126,17 @@ public byte[] Encode(byte[] data, PdfFlateEncodeMode mode)
//
// The information in FLEVEL is not needed for decompression; it
// is there to indicate if recompression might be worthwhile.
ms.WriteByte(0x49);
ms.WriteByte(0x01);

DeflateStream zip = new DeflateStream(ms, CompressionMode.Compress, true);
zip.Write(data, 0, data.Length);
zip.Close();

var checksum = CalcChecksum(data);
ms.WriteByte((byte)checksum);
ms.WriteByte((byte)(checksum >> 8));
ms.WriteByte((byte)(checksum >> 16));
ms.WriteByte((byte)(checksum >> 24));
#else
int level = Deflater.DEFAULT_COMPRESSION;
switch (mode)
Expand All @@ -153,6 +159,21 @@ public byte[] Encode(byte[] data, PdfFlateEncodeMode mode)
return ms.ToArray();
#endif
}

private const int Modulus = 65521;

private static int CalcChecksum(byte[] data)
{
var a = 1;
var b = 0;
for (int i = 0; i < data.Length; ++i)
{
a = (a + data[i]) % Modulus;
b = (b + a) % Modulus;
}

return b * 65536 + a;
}

/// <summary>
/// Decodes the specified data.
Expand Down
23 changes: 0 additions & 23 deletions src/PdfSharp/PdfSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,25 +389,6 @@
<Compile Include="root\ProductVersionInfo.cs" />
<Compile Include="root\PSSR.cs" />
<Compile Include="root\VersionInfo.cs" />
<Compile Include="SharpZipLib\Checksums\Adler32.cs" />
<Compile Include="SharpZipLib\Checksums\CRC32.cs" />
<Compile Include="SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include="SharpZipLib\SharpZipBaseException.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include="SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include="SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include="SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include="SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include="SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include="SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include="SharpZipLib\Zip\ZipException.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Messages.de.restext">
Expand All @@ -416,13 +397,9 @@
<EmbeddedResource Include="Resources\Messages.restext" />
<None Include="StrongnameKey.snk" />
</ItemGroup>
<ItemGroup>
<Content Include="SharpZipLib\ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Drawing\internal\" />
<Folder Include="Resources\images\" />
<Folder Include="SharpZipLib\SharpZip\" />
</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
Loading