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

Corrected sidecar invalid usage of int for block numbers.

Browse Source
This commit is contained in:
Natalia Portillo
2017-06-08 22:01:06 +01:00
parent 3395c01fda
commit 6e7275d5b1
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CICMMetadata

Submodule CICMMetadata updated: 6b977feff5...18665665e4

2
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -829,7 +829,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0] = new ExtentType
{
Start = 0,
End = (int)(blocks - 1)
End = blocks - 1
};
sidecar.OpticalDisc[0].DumpHardwareArray[0].Manufacturer = dev.Manufacturer;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Model = dev.Model;

4
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -708,7 +708,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0] = new ExtentType
{
Start = 0,
End = (int)(blocks - 1)
End = blocks - 1
};
sidecar.OpticalDisc[0].DumpHardwareArray[0].Manufacturer = dev.Manufacturer;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Model = dev.Model;
@@ -831,7 +831,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.BlockMedia[0].DumpHardwareArray[0].Extents[0] = new ExtentType
{
Start = 0,
End = (int)(blocks - 1)
End = blocks - 1
};
sidecar.BlockMedia[0].DumpHardwareArray[0].Manufacturer = dev.Manufacturer;
sidecar.BlockMedia[0].DumpHardwareArray[0].Model = dev.Model;

2
DiscImageChef.Core/Devices/Dumping/SSC.cs
View File

@@ -591,7 +591,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.BlockMedia[0].DumpHardwareArray[0].Extents[0] = new ExtentType
{
Start = 0,
End = (int)(blocks - 1)
End = blocks - 1
};
sidecar.BlockMedia[0].DumpHardwareArray[0].Manufacturer = dev.Manufacturer;
sidecar.BlockMedia[0].DumpHardwareArray[0].Model = dev.Model;

2
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -765,7 +765,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0] = new ExtentType
{
Start = 0,
End = (int)(blocks - 1)
End = blocks - 1
};
sidecar.OpticalDisc[0].DumpHardwareArray[0].Manufacturer = dev.Manufacturer;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Model = dev.Model;

2
DiscImageChef.Core/Sidecar.cs
View File

@@ -657,7 +657,7 @@ namespace DiscImageChef.Core
sidecar.OpticalDisc[0].DumpHardwareArray = new DumpHardwareType[1];
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents = new ExtentType[0];
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0].Start = 0;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0].End = (int)image.ImageInfo.sectors;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Extents[0].End = image.ImageInfo.sectors;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Manufacturer = image.ImageInfo.driveManufacturer;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Model = image.ImageInfo.driveModel;
sidecar.OpticalDisc[0].DumpHardwareArray[0].Firmware = image.ImageInfo.driveFirmwareRevision;

14
DiscImageChef.Metadata/ExtentsConverter.cs
View File

@@ -38,31 +38,31 @@ namespace DiscImageChef.Metadata
{
public static class ExtentsConverter
{
public static ExtentType[] ToMetadata(ExtentsInt extents)
public static ExtentType[] ToMetadata(ExtentsULong extents)
{
if(extents == null)
return null;
Tuple<int, int>[] tuples = extents.ToArray();
Tuple<ulong, ulong>[] tuples = extents.ToArray();
ExtentType[] array = new ExtentType[tuples.Length];
for(int i = 0; i < array.Length; i++)
for(ulong i = 0; i < (ulong)array.LongLength; i++)
array[i] = new ExtentType { Start = tuples[i].Item1, End = tuples[i].Item2 };
return array;
}
public static ExtentsInt FromMetadata(ExtentType[] extents)
public static ExtentsULong FromMetadata(ExtentType[] extents)
{
if(extents == null)
return null;
List<Tuple<int, int>> tuples = new List<Tuple<int, int>>();
List<Tuple<ulong, ulong>> tuples = new List<Tuple<ulong, ulong>>();
foreach(ExtentType extent in extents)
tuples.Add(new Tuple<int, int>(extent.Start, extent.End));
tuples.Add(new Tuple<ulong, ulong>(extent.Start, extent.End));
return new ExtentsInt(tuples);
return new ExtentsULong(tuples);
}
}
}