Begin cleaning up the Layout stuff.

This commit is contained in:
David Given
2022-09-15 21:45:12 +02:00
parent 8eb17bf104
commit 88fc7ff9c3
13 changed files with 42 additions and 42 deletions

View File

@@ -107,12 +107,12 @@ std::unique_ptr<Image> ImageReader::readMappedImage()
std::set<std::shared_ptr<const Sector>> sectors;
for (const auto& e : *rawImage)
{
auto& trackLayout =
auto trackLayout =
Layout::getLayoutOfTrack(e->logicalTrack, e->logicalSide);
auto newSector = std::make_shared<Sector>();
*newSector = *e;
newSector->logicalSector =
trackLayout.filesystemToLogicalSectorMap.at(e->logicalSector);
trackLayout->filesystemToLogicalSectorMap.at(e->logicalSector);
sectors.insert(newSector);
}

View File

@@ -39,10 +39,10 @@ public:
if (inputFile.eof())
break;
auto& trackLayout = Layout::getLayoutOfTrack(track, side);
for (int sectorId : trackLayout.logicalSectorOrder)
auto trackLayout = Layout::getLayoutOfTrack(track, side);
for (int sectorId : trackLayout->logicalSectorOrder)
{
Bytes data(trackLayout.sectorSize);
Bytes data(trackLayout->sectorSize);
inputFile.read((char*)data.begin(), data.size());
const auto& sector = image->put(track, side, sectorId);