Skip to content

Commit

Permalink
Replaced cpp17::optional with std::optional in scm-to-cereal.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
patrikhuber committed Dec 15, 2024
1 parent b06ee68 commit 4a04443
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions utils/scm-to-cereal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*/
#include "eos/morphablemodel/MorphableModel.hpp"
#include "eos/morphablemodel/io/cvssp.hpp"
#include "eos/cpp17/optional.hpp"

#include "boost/program_options.hpp"

Expand Down Expand Up @@ -70,8 +69,8 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
}

cpp17::optional<std::string> isomapfile_optional =
isomapfile.empty() ? cpp17::nullopt : cpp17::optional<std::string>(isomapfile);
std::optional<std::string> isomapfile_optional =
isomapfile.empty() ? std::nullopt : std::optional<std::string>(isomapfile);

// Load the .scm Morphable Model and save it as cereal model:
morphablemodel::MorphableModel morphable_model =
Expand All @@ -81,7 +80,7 @@ int main(int argc, char* argv[])
{
// Save only the shape model - to generate the public sfm_shape_3448.bin
const morphablemodel::MorphableModel shape_only_model(morphable_model.get_shape_model(),
morphablemodel::PcaModel(), cpp17::nullopt,
morphablemodel::PcaModel(), std::nullopt,
morphable_model.get_texture_coordinates());
morphablemodel::save_model(shape_only_model, outputfile);
} else
Expand Down

0 comments on commit 4a04443

Please sign in to comment.