mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
REFACTOR: Reformat code.
This commit is contained in:
@@ -41,86 +41,76 @@ namespace DiscImageChef
|
||||
{
|
||||
readonly byte[] buffer = new byte[8];
|
||||
|
||||
public EndianAwareBinaryReader(Stream input, Encoding encoding, bool isLittleEndian)
|
||||
: base(input, encoding)
|
||||
public EndianAwareBinaryReader(Stream input, Encoding encoding, bool isLittleEndian) : base(input, encoding)
|
||||
{
|
||||
IsLittleEndian = isLittleEndian;
|
||||
}
|
||||
|
||||
public EndianAwareBinaryReader(Stream input, bool isLittleEndian)
|
||||
: this(input, Encoding.UTF8, isLittleEndian)
|
||||
{
|
||||
}
|
||||
public EndianAwareBinaryReader(Stream input, bool isLittleEndian) :
|
||||
this(input, Encoding.UTF8, isLittleEndian) { }
|
||||
|
||||
public bool IsLittleEndian
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public bool IsLittleEndian { get; set; }
|
||||
|
||||
public override double ReadDouble()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadDouble();
|
||||
if(IsLittleEndian) return base.ReadDouble();
|
||||
|
||||
FillMyBuffer(8);
|
||||
return BitConverter.ToDouble(buffer.Take(8).Reverse().ToArray(), 0);
|
||||
}
|
||||
|
||||
public override short ReadInt16()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadInt16();
|
||||
if(IsLittleEndian) return base.ReadInt16();
|
||||
|
||||
FillMyBuffer(2);
|
||||
return BitConverter.ToInt16(buffer.Take(2).Reverse().ToArray(), 0);
|
||||
|
||||
}
|
||||
|
||||
public override int ReadInt32()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadInt32();
|
||||
if(IsLittleEndian) return base.ReadInt32();
|
||||
|
||||
FillMyBuffer(4);
|
||||
return BitConverter.ToInt32(buffer.Take(4).Reverse().ToArray(), 0);
|
||||
|
||||
}
|
||||
|
||||
public override long ReadInt64()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadInt64();
|
||||
if(IsLittleEndian) return base.ReadInt64();
|
||||
|
||||
FillMyBuffer(8);
|
||||
return BitConverter.ToInt64(buffer.Take(8).Reverse().ToArray(), 0);
|
||||
|
||||
}
|
||||
|
||||
public override float ReadSingle()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadSingle();
|
||||
if(IsLittleEndian) return base.ReadSingle();
|
||||
|
||||
FillMyBuffer(4);
|
||||
return BitConverter.ToSingle(buffer.Take(4).Reverse().ToArray(), 0);
|
||||
}
|
||||
|
||||
public override ushort ReadUInt16()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadUInt16();
|
||||
if(IsLittleEndian) return base.ReadUInt16();
|
||||
|
||||
FillMyBuffer(2);
|
||||
return BitConverter.ToUInt16(buffer.Take(2).Reverse().ToArray(), 0);
|
||||
}
|
||||
|
||||
public override uint ReadUInt32()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadUInt32();
|
||||
if(IsLittleEndian) return base.ReadUInt32();
|
||||
|
||||
FillMyBuffer(4);
|
||||
return BitConverter.ToUInt32(buffer.Take(4).Reverse().ToArray(), 0);
|
||||
}
|
||||
|
||||
public override ulong ReadUInt64()
|
||||
{
|
||||
if(IsLittleEndian)
|
||||
return base.ReadUInt64();
|
||||
if(IsLittleEndian) return base.ReadUInt64();
|
||||
|
||||
FillMyBuffer(8);
|
||||
return BitConverter.ToUInt64(buffer.Take(8).Reverse().ToArray(), 0);
|
||||
}
|
||||
@@ -132,10 +122,8 @@ namespace DiscImageChef
|
||||
if(numBytes == 1)
|
||||
{
|
||||
num2 = BaseStream.ReadByte();
|
||||
if(num2 == -1)
|
||||
{
|
||||
throw new EndOfStreamException("Attempted to read past the end of the stream.");
|
||||
}
|
||||
if(num2 == -1) { throw new EndOfStreamException("Attempted to read past the end of the stream."); }
|
||||
|
||||
buffer[0] = (byte)num2;
|
||||
}
|
||||
else
|
||||
@@ -143,10 +131,8 @@ namespace DiscImageChef
|
||||
do
|
||||
{
|
||||
num2 = BaseStream.Read(buffer, offset, numBytes - offset);
|
||||
if(num2 == 0)
|
||||
{
|
||||
throw new EndOfStreamException("Attempted to read past the end of the stream.");
|
||||
}
|
||||
if(num2 == 0) { throw new EndOfStreamException("Attempted to read past the end of the stream."); }
|
||||
|
||||
offset += num2;
|
||||
}
|
||||
while(offset < numBytes);
|
||||
|
||||
Reference in New Issue
Block a user