epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some basic error handling to png metadata writing.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-04-11 16:03:42 +02:00
committed by atlimit8
parent 2b4035979b
commit 53d916d7f1
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/UtilityCommands/PngSheetImportMetadataCommand.cs
View File

@@ -10,7 +10,9 @@
#endregion #endregion
using System.IO; using System.IO;
using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Primitives;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands
{ {
@@ -30,7 +32,23 @@ namespace OpenRA.Mods.Common.UtilityCommands
using (var pngStream = File.OpenRead(args[1])) using (var pngStream = File.OpenRead(args[1]))
png = new Png(pngStream); png = new Png(pngStream);
foreach (var node in MiniYaml.FromFile(Path.ChangeExtension(args[1], "yaml"))) var yaml = MiniYaml.FromFile(Path.ChangeExtension(args[1], "yaml"));
var frameSizeField = yaml.Where(y => y.Key == "FrameSize").Select(y => y.Value.Value).FirstOrDefault();
if (frameSizeField != null)
{
var frameSize = FieldLoader.GetValue<Size>("FrameSize", frameSizeField);
var frameAmountField = yaml.Where(y => y.Key == "FrameAmount").Select(y => y.Value.Value).FirstOrDefault();
if (frameAmountField != null)
{
var frameAmount = FieldLoader.GetValue<int>("FrameAmount", frameAmountField);
if (frameAmount > (png.Width / frameSize.Width) * (png.Height / frameSize.Height))
throw new InvalidDataException(".png file is too small for given FrameSize and FrameAmount.");
}
}
foreach (var node in yaml)
png.EmbeddedData[node.Key] = node.Value.Value; png.EmbeddedData[node.Key] = node.Value.Value;
png.Save(args[1]); png.Save(args[1]);