aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛Implement Apple RLE algorithm, fix #120, thanks to David Ryskalczyk.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-21 15:58:12 +00:00
parent 963a1d4877
commit 4e9605a937
6 changed files with 278 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
DiscImageChef.DiscImages/NDIF.cs
View File

@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
using System.Text;
using Claunia.RsrcFork;
using DiscImageChef.CommonTypes;
using DiscImageChef.Compression;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using SharpCompress.Compressors.ADC;
@@ -236,8 +237,6 @@ namespace DiscImageChef.DiscImages
case CHUNK_TYPE_KENCODE:
throw new
ImageNotSupportedException("Chunks compressed with KenCode are not yet supported.");
case CHUNK_TYPE_RLE:
throw new ImageNotSupportedException("Chunks compressed with RLE are not yet supported.");
case CHUNK_TYPE_LZH:
throw new ImageNotSupportedException("Chunks compressed with LZH are not yet supported.");
case CHUNK_TYPE_STUFFIT:
@@ -411,15 +410,41 @@ namespace DiscImageChef.DiscImages
imageStream.Seek(currentChunk.offset, SeekOrigin.Begin);
imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
MemoryStream cmpMs = new MemoryStream(cmpBuffer);
Stream decStream;
int realSize = 0;
if(currentChunk.type == CHUNK_TYPE_ADC) decStream = new ADCStream(cmpMs);
else throw new ImageNotSupportedException($"Unsupported chunk type 0x{currentChunk.type:X8} found");
switch(currentChunk.type)
{
case CHUNK_TYPE_ADC:
{
Stream decStream = new ADCStream(cmpMs);
byte[] tmpBuffer = new byte[buffersize];
realSize = decStream.Read(tmpBuffer, 0, (int)buffersize);
buffer = new byte[realSize];
Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
break;
}
case CHUNK_TYPE_RLE:
{
byte[] tmpBuffer = new byte[buffersize];
realSize = 0;
AppleRle rle = new AppleRle(cmpMs);
for(int i = 0; i < buffersize; i++)
{
int b = rle.ProduceByte();
if(b == -1) break;
byte[] tmpBuffer = new byte[buffersize];
int realSize = decStream.Read(tmpBuffer, 0, (int)buffersize);
buffer = new byte[realSize];
Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
tmpBuffer[i] = (byte)b;
realSize++;
}
buffer = new byte[realSize];
Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
break;
}
default:
throw new
ImageNotSupportedException($"Unsupported chunk type 0x{currentChunk.type:X8} found");
}
if(currentChunkCacheSize + realSize > MAX_CACHE_SIZE)
{