maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-08 17:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Fix) OSF: Can't decode some files

Browse Source
This commit is contained in:
Tiago Conceição
2022-08-23 20:50:12 +01:00
parent 0206ce3f70
commit 466f328c63
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UVtools.Core/FileFormats/OSFFile.cs
+22 -7
View File
@@ -817,18 +817,33 @@ public class OSFFile : FileFormat
foreach (var layerIndex in batch)
{
progress.ThrowIfCancellationRequested();
//Debug.WriteLine($"{layerIndex}: {inputFile.Position}");
layerDef[layerIndex] = Helpers.Deserialize<OSFLayerDef>(inputFile);
while ((buffer = inputFile.ReadByte()) > -1)
{
if (buffer == 0x0D)
if (buffer != 0x0D) // Not what we want, add and continue
{
if ((buffer = inputFile.ReadByte()) >= -1 && buffer is 0x0A or 0x0B)
{
inputFile.Seek(-2, SeekOrigin.Current);
break;
}
rle.Add((byte)buffer);
continue;
}
rle.Add(0x0D);
// Check next byte for 0x0A or 0x0B
buffer = inputFile.ReadByte();
if (buffer is 0x0A or 0x0B)
{
inputFile.Seek(-2, SeekOrigin.Current);
break;
}
rle.Add(0x0D); // Add previous byte
if (buffer == -1) break; // End of file
if (buffer == 0x0D) // 0x0D pair, rewind 1 and recheck
{
inputFile.Seek(-1, SeekOrigin.Current);
continue;
}
rle.Add((byte)buffer);