starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 15:34:34 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Fix all platform support

Browse Source
This commit is contained in:
Adam Hathcock
2018-04-29 11:33:49 +01:00
parent 031b3c55f6
commit d9c178cbee
8 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/SharpCompress/Archives/Rar/RarArchive.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

2
src/SharpCompress/Archives/Rar/RarArchiveEntry.cs
View File

@@ -24,7 +24,7 @@ namespace SharpCompress.Archives.Rar
public IArchive Archive => archive;
internal override IEnumerable<FilePart> Parts => this.parts;
internal override IEnumerable<FilePart> Parts => parts.Cast<FilePart>();
internal override FileHeader FileHeader => parts.First().FileHeader;

4
src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs
View File

@@ -10,10 +10,6 @@ using size_t = System.UInt64;
using int64 = System.Int64;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SharpCompress.Compressors.Rar.UnpackV2017
{

6
src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
View File

@@ -334,7 +334,7 @@ void UnpWriteBuf()
FragWindow.CopyData(Mem,0,BlockStart,BlockLength);
else
//x memcpy(Mem,Window+BlockStart,BlockLength);
Array.Copy(Window, BlockStart, Mem, 0, BlockLength);
Utility.Copy(Window, BlockStart, Mem, 0, BlockLength);
}
else
{
@@ -347,9 +347,9 @@ void UnpWriteBuf()
else
{
//x memcpy(Mem,Window+BlockStart,FirstPartLength);
Array.Copy(Window, BlockStart, Mem, 0, FirstPartLength);
Utility.Copy(Window, BlockStart, Mem, 0, FirstPartLength);
//x memcpy(Mem+FirstPartLength,Window,BlockEnd);
Array.Copy(Window, 0, Mem, FirstPartLength,BlockEnd);
Utility.Copy(Window, 0, Mem, FirstPartLength,BlockEnd);
}
}

29
src/SharpCompress/Lazy.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
namespace SharpCompress
{
public class Lazy<T>
{
private readonly Func<T> _lazyFunc;
private bool _evaluated;
private T _value;
public Lazy(Func<T> lazyFunc)
{
_lazyFunc = lazyFunc;
}
public T Value
{
get
{
if (!_evaluated)
{
_value = _lazyFunc();
_evaluated = true;
}
return _value;
}
}
}
}

3
src/SharpCompress/Readers/Rar/RarReader.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using SharpCompress.Common;

2
src/SharpCompress/SharpCompress.csproj
View File

@@ -6,7 +6,7 @@
<AssemblyVersion>0.20.0</AssemblyVersion>
<FileVersion>0.20.0</FileVersion>
<Authors>Adam Hathcock</Authors>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net45;net35;netstandard1.0;netstandard1.3;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>SharpCompress</AssemblyName>

12
src/SharpCompress/Utility.cs
View File

@@ -184,6 +184,18 @@ namespace SharpCompress
action(item);
}
}
public static void Copy(Array sourceArray, long sourceIndex, Array destinationArray, long destinationIndex, long length)
{
if (sourceIndex > Int32.MaxValue || sourceIndex < Int32.MinValue)
throw new ArgumentOutOfRangeException();
if (destinationIndex > Int32.MaxValue || destinationIndex < Int32.MinValue)
throw new ArgumentOutOfRangeException();
if (length > Int32.MaxValue || length < Int32.MinValue)
throw new ArgumentOutOfRangeException();
Array.Copy(sourceArray, (int)sourceIndex, destinationArray, (int)destinationIndex, (int)length);
}
public static IEnumerable<T> AsEnumerable<T>(this T item)
{