Merge from master.

This commit is contained in:
David Given
2021-10-30 22:19:37 +02:00
89 changed files with 13090 additions and 6473 deletions

View File

@@ -74,3 +74,20 @@ ImageReader::ImageReader(const ImageReaderProto& config):
_config(config)
{}
void getTrackFormat(const ImgInputOutputProto& config,
ImgInputOutputProto::TrackdataProto& trackdata, unsigned track, unsigned side)
{
trackdata.Clear();
for (const ImgInputOutputProto::TrackdataProto& f : config.trackdata())
{
if (f.has_track() && f.has_up_to_track() && ((track < f.track()) || (track > f.up_to_track())))
continue;
if (f.has_track() && !f.has_up_to_track() && (track != f.track()))
continue;
if (f.has_side() && (f.side() != side))
continue;
trackdata.MergeFrom(f);
}
}