From 6e7275d5b1fb7f475cd816ccca9988af9911ebef Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 8 Jun 2017 22:01:06 +0100 Subject: [PATCH] Corrected sidecar invalid usage of int for block numbers. --- CICMMetadata | 2 +- DiscImageChef.Core/Devices/Dumping/CompactDisc.cs | 2 +- DiscImageChef.Core/Devices/Dumping/SBC.cs | 4 ++-- DiscImageChef.Core/Devices/Dumping/SSC.cs | 2 +- DiscImageChef.Core/Devices/Dumping/XGD.cs | 2 +- DiscImageChef.Core/Sidecar.cs | 2 +- DiscImageChef.Metadata/ExtentsConverter.cs | 14 +++++++------- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CICMMetadata b/CICMMetadata index 6b977fef..18665665 160000 --- a/CICMMetadata +++ b/CICMMetadata @@ -1 +1 @@ -Subproject commit 6b977feff5dae71f999dc7c3267e22fdbc2206fa +Subproject commit 18665665e4c580411299ffd1c94f05b00280f4ee diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index a48b8723..00c76508 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -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; diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs index 903e6489..b782f327 100644 --- a/DiscImageChef.Core/Devices/Dumping/SBC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs @@ -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; diff --git a/DiscImageChef.Core/Devices/Dumping/SSC.cs b/DiscImageChef.Core/Devices/Dumping/SSC.cs index c07b9ce8..6fd1d477 100644 --- a/DiscImageChef.Core/Devices/Dumping/SSC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SSC.cs @@ -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; diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index 72147b89..af75a36b 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -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; diff --git a/DiscImageChef.Core/Sidecar.cs b/DiscImageChef.Core/Sidecar.cs index ece78569..fe2189ca 100644 --- a/DiscImageChef.Core/Sidecar.cs +++ b/DiscImageChef.Core/Sidecar.cs @@ -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; diff --git a/DiscImageChef.Metadata/ExtentsConverter.cs b/DiscImageChef.Metadata/ExtentsConverter.cs index 75ccefde..ee3c570b 100644 --- a/DiscImageChef.Metadata/ExtentsConverter.cs +++ b/DiscImageChef.Metadata/ExtentsConverter.cs @@ -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[] tuples = extents.ToArray(); + Tuple[] 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> tuples = new List>(); + List> tuples = new List>(); foreach(ExtentType extent in extents) - tuples.Add(new Tuple(extent.Start, extent.End)); + tuples.Add(new Tuple(extent.Start, extent.End)); - return new ExtentsInt(tuples); + return new ExtentsULong(tuples); } } }