diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-06-26 01:20:34 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-06-27 00:07:44 +0200 |
| commit | 54617cea2d186bd62eb44b07292b8722fe59ed4e (patch) | |
| tree | c7dc8bf96e4bfe2705e17eb3299dfa53e4cd162d /src | |
| parent | 868ee4db539fe07542699836b76d5e51892b39ed (diff) | |
Cleanup: better variable names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dcp.cc | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -174,8 +174,9 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m vector<shared_ptr<Asset>> other_assets; auto ids_and_paths = _asset_map->asset_ids_and_paths(); - for (auto i: ids_and_paths) { - auto const path = i.second; + for (auto id_and_path: ids_and_paths) { + auto const id = id_and_path.first; + auto const path = id_and_path.second; if (path == _directory) { /* I can't see how this is valid, but it's @@ -198,7 +199,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m /* Find the <Type> for this asset from the PKL that contains the asset */ optional<string> pkl_type; for (auto j: _pkls) { - pkl_type = j->type(i.first); + pkl_type = j->type(id); if (pkl_type) { break; } @@ -257,7 +258,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, path}); } } else if (*pkl_type == remove_parameters(FontAsset::static_pkl_type(standard))) { - other_assets.push_back (make_shared<FontAsset>(i.first, path)); + other_assets.push_back(make_shared<FontAsset>(id, path)); } else if (*pkl_type == "image/png") { /* It's an Interop PNG subtitle; let it go */ } else { |