mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Begin cleaning up the Layout stuff.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user