Move to faster ZLibStream

PunkPun · PunkPun · commit 9528f19845af · 2026-01-19T15:26:21.000+02:00
diff --git a/OpenRA.Game/FileFormats/Png.cs b/OpenRA.Game/FileFormats/Png.cs
@@ -12,24 +12,17 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Net;
 using System.Text;
-using ICSharpCode.SharpZipLib.Zip.Compression;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 
 namespace OpenRA.FileFormats
 {
 	public class Png
 	{
-		public enum Compression : byte
-		{
-			BEST_COMPRESSION = Deflater.BEST_COMPRESSION,
-			BEST_SPEED = Deflater.BEST_SPEED,
-		}
-
 		static readonly byte[] Signature = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
 
 		public int Width { get; }
@@ -139,7 +132,7 @@ public Png(Stream s)
 						{
 							using (var ns = new MemoryStream(data.ToArray()))
 							{
-								using (var ds = new InflaterInputStream(ns))
+								using (var ds = new ZLibStream(ns, CompressionMode.Decompress))
 								{
 									var pxStride = PixelStride;
 									var rowStride = Width * pxStride;
@@ -340,7 +333,7 @@ static void WritePngChunk(MemoryStream output, string type, MemoryStream input)
 			output.Write(IPAddress.NetworkToHostOrder((int)finalCrc));
 		}
 
-		public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)
+		public byte[] Save(CompressionLevel compression = CompressionLevel.SmallestSize)
 		{
 			using (var output = new MemoryStream())
 			{
@@ -392,7 +385,7 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)
 
 				using (var data = new MemoryStream())
 				{
-					using (var compressed = new DeflaterOutputStream(data, new Deflater((int)compression)))
+					using (var compressed = new ZLibStream(data, compression, true))
 					{
 						var rowStride = Width * PixelStride;
 						for (var y = 0; y < Height; y++)
@@ -402,12 +395,9 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)
 							compressed.WriteByte(FilterType);
 							compressed.Write(Data, y * rowStride, rowStride);
 						}
-
-						compressed.Flush();
-						compressed.Finish();
-
-						WritePngChunk(output, "IDAT", data);
 					}
+
+					WritePngChunk(output, "IDAT", data);
 				}
 
 				foreach (var kv in EmbeddedData)
@@ -424,7 +414,7 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)
 			}
 		}
 
-		public void Save(string path, Compression compression = Compression.BEST_COMPRESSION)
+		public void Save(string path, CompressionLevel compression = CompressionLevel.SmallestSize)
 		{
 			File.WriteAllBytes(path, Save(compression));
 		}
diff --git a/OpenRA.Mods.Common/UtilityCommands/DumpSequenceSheetsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/DumpSequenceSheetsCommand.cs
@@ -11,7 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.FileFormats;
+using System.IO.Compression;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 
@@ -100,14 +100,14 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 		public static void CommitSheet(SheetBuilder builder, Sheet sheet, string name, ImmutablePalette palette, ref int count)
 		{
 			if (builder == null)
-				sheet.AsPng().Save($"{count++}.{name}.png", Png.Compression.BEST_SPEED);
+				sheet.AsPng().Save($"{count++}.{name}.png", CompressionLevel.Fastest);
 			else
 			{
 				if (palette != null)
 				{
 					var channels = sheet == builder.Current ? (int)builder.CurrentChannel + 1 : 4;
 					for (var i = 0; i < channels; i++)
-						sheet.AsPng((TextureChannel)ChannelMasks[i], palette).Save($"{count}.{i}.{name}.png", Png.Compression.BEST_SPEED);
+						sheet.AsPng((TextureChannel)ChannelMasks[i], palette).Save($"{count}.{i}.{name}.png", CompressionLevel.Fastest);
 
 					count++;
 				}

Original file line number	Diff line number	Diff line change
`@@ -12,24 +12,17 @@`
`12`	`12`	`using System;`
`13`	`13`	`using System.Collections.Generic;`
`14`	`14`	`using System.IO;`
	`15`	`+using System.IO.Compression;`
`15`	`16`	`using System.Linq;`
`16`	`17`	`using System.Net;`
`17`	`18`	`using System.Text;`
`18`		`-using ICSharpCode.SharpZipLib.Zip.Compression;`
`19`		`-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;`
`20`	`19`	`using OpenRA.Graphics;`
`21`	`20`	`using OpenRA.Primitives;`
`22`	`21`
`23`	`22`	`namespace OpenRA.FileFormats`
`24`	`23`	`{`
`25`	`24`	`public class Png`
`26`	`25`	`{`
`27`		`- public enum Compression : byte`
`28`		`- {`
`29`		`- BEST_COMPRESSION = Deflater.BEST_COMPRESSION,`
`30`		`- BEST_SPEED = Deflater.BEST_SPEED,`
`31`		`- }`
`32`		`-`
`33`	`26`	`static readonly byte[] Signature = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];`
`34`	`27`
`35`	`28`	`public int Width { get; }`
`@@ -139,7 +132,7 @@ public Png(Stream s)`
`139`	`132`	`{`
`140`	`133`	`using (var ns = new MemoryStream(data.ToArray()))`
`141`	`134`	`{`
`142`		`- using (var ds = new InflaterInputStream(ns))`
	`135`	`+ using (var ds = new ZLibStream(ns, CompressionMode.Decompress))`
`143`	`136`	`{`
`144`	`137`	`var pxStride = PixelStride;`
`145`	`138`	`var rowStride = Width * pxStride;`
`@@ -340,7 +333,7 @@ static void WritePngChunk(MemoryStream output, string type, MemoryStream input)`
`340`	`333`	`output.Write(IPAddress.NetworkToHostOrder((int)finalCrc));`
`341`	`334`	`}`
`342`	`335`
`343`		`- public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)`
	`336`	`+ public byte[] Save(CompressionLevel compression = CompressionLevel.SmallestSize)`
`344`	`337`	`{`
`345`	`338`	`using (var output = new MemoryStream())`
`346`	`339`	`{`
`@@ -392,7 +385,7 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)`
`392`	`385`
`393`	`386`	`using (var data = new MemoryStream())`
`394`	`387`	`{`
`395`		`- using (var compressed = new DeflaterOutputStream(data, new Deflater((int)compression)))`
	`388`	`+ using (var compressed = new ZLibStream(data, compression, true))`
`396`	`389`	`{`
`397`	`390`	`var rowStride = Width * PixelStride;`
`398`	`391`	`for (var y = 0; y < Height; y++)`
`@@ -402,12 +395,9 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)`
`402`	`395`	`compressed.WriteByte(FilterType);`
`403`	`396`	`compressed.Write(Data, y * rowStride, rowStride);`
`404`	`397`	`}`
`405`		`-`
`406`		`- compressed.Flush();`
`407`		`- compressed.Finish();`
`408`		`-`
`409`		`- WritePngChunk(output, "IDAT", data);`
`410`	`398`	`}`
	`399`	`+`
	`400`	`+ WritePngChunk(output, "IDAT", data);`
`411`	`401`	`}`
`412`	`402`
`413`	`403`	`foreach (var kv in EmbeddedData)`
`@@ -424,7 +414,7 @@ public byte[] Save(Compression compression = Compression.BEST_COMPRESSION)`
`424`	`414`	`}`
`425`	`415`	`}`
`426`	`416`
`427`		`- public void Save(string path, Compression compression = Compression.BEST_COMPRESSION)`
	`417`	`+ public void Save(string path, CompressionLevel compression = CompressionLevel.SmallestSize)`
`428`	`418`	`{`
`429`	`419`	`File.WriteAllBytes(path, Save(compression));`
`430`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`using System;`
`13`	`13`	`using System.Collections.Generic;`
`14`		`-using OpenRA.FileFormats;`
	`14`	`+using System.IO.Compression;`
`15`	`15`	`using OpenRA.FileSystem;`
`16`	`16`	`using OpenRA.Graphics;`
`17`	`17`
`@@ -100,14 +100,14 @@ void IUtilityCommand.Run(Utility utility, string[] args)`
`100`	`100`	`public static void CommitSheet(SheetBuilder builder, Sheet sheet, string name, ImmutablePalette palette, ref int count)`
`101`	`101`	`{`
`102`	`102`	`if (builder == null)`
`103`		`- sheet.AsPng().Save($"{count++}.{name}.png", Png.Compression.BEST_SPEED);`
	`103`	`+ sheet.AsPng().Save($"{count++}.{name}.png", CompressionLevel.Fastest);`
`104`	`104`	`else`
`105`	`105`	`{`
`106`	`106`	`if (palette != null)`
`107`	`107`	`{`
`108`	`108`	`var channels = sheet == builder.Current ? (int)builder.CurrentChannel + 1 : 4;`
`109`	`109`	`for (var i = 0; i < channels; i++)`
`110`		`- sheet.AsPng((TextureChannel)ChannelMasks[i], palette).Save($"{count}.{i}.{name}.png", Png.Compression.BEST_SPEED);`
	`110`	`+ sheet.AsPng((TextureChannel)ChannelMasks[i], palette).Save($"{count}.{i}.{name}.png", CompressionLevel.Fastest);`
`111`	`111`
`112`	`112`	`count++;`
`113`	`113`	`}`