Fix type of public "offset" property in ResourceReader

This commit is contained in:
VaDiM 2024-03-31 02:26:54 +03:00
parent 684bf5a874
commit 97bbfe8fbb

View File

@ -7,7 +7,6 @@ namespace AssetStudio
private bool needSearch; private bool needSearch;
private string path; private string path;
private SerializedFile assetsFile; private SerializedFile assetsFile;
private long offset;
private long size; private long size;
private BinaryReader reader; private BinaryReader reader;
@ -16,11 +15,7 @@ namespace AssetStudio
get => (int)size; get => (int)size;
set => size = value; set => size = value;
} }
public int Offset public long Offset { get; set; }
{
get => (int)offset;
set => offset = value;
}
public ResourceReader() { } public ResourceReader() { }
@ -29,14 +24,14 @@ namespace AssetStudio
needSearch = true; needSearch = true;
this.path = path; this.path = path;
this.assetsFile = assetsFile; this.assetsFile = assetsFile;
this.offset = offset; this.Offset = offset;
this.size = size; this.size = size;
} }
public ResourceReader(BinaryReader reader, long offset, long size) public ResourceReader(BinaryReader reader, long offset, long size)
{ {
this.reader = reader; this.reader = reader;
this.offset = offset; this.Offset = offset;
this.size = size; this.size = size;
} }
@ -84,7 +79,7 @@ namespace AssetStudio
var binaryReader = GetReader(); var binaryReader = GetReader();
lock (binaryReader) lock (binaryReader)
{ {
binaryReader.BaseStream.Position = offset; binaryReader.BaseStream.Position = Offset;
return binaryReader.ReadBytes((int) size); return binaryReader.ReadBytes((int) size);
} }
} }
@ -94,7 +89,7 @@ namespace AssetStudio
var binaryReader = GetReader(); var binaryReader = GetReader();
lock (binaryReader) lock (binaryReader)
{ {
binaryReader.BaseStream.Position = offset; binaryReader.BaseStream.Position = Offset;
binaryReader.Read(buff, 0, (int) size); binaryReader.Read(buff, 0, (int) size);
} }
} }
@ -102,7 +97,7 @@ namespace AssetStudio
public void WriteData(string path) public void WriteData(string path)
{ {
var binaryReader = GetReader(); var binaryReader = GetReader();
binaryReader.BaseStream.Position = offset; binaryReader.BaseStream.Position = Offset;
using (var writer = File.OpenWrite(path)) using (var writer = File.OpenWrite(path))
{ {
binaryReader.BaseStream.CopyTo(writer, size); binaryReader.BaseStream.CopyTo(writer, size);