Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoulon committed May 12, 2015
1 parent 1b26b14 commit e0e3d63
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ int main(int argc, char **argv)
<< "[-o|--outdir path] \n"
<< "\n[Optional]\n"
<< "[-r|--ratio Distance ratio to discard non meaningful matches\n"
<< " 0.6 typical value (you can use 0.8 to have more matches)]"
<< " 0.6 typical value (you can use 0.8 to have more matches)]\n"
<< "[-g|--geometricModel\n"
<< " (pairwise correspondences filtering thanks to robust model estimation):\n"
<< " f: fundamental matrix,\n"
Expand Down Expand Up @@ -206,6 +206,9 @@ int main(int argc, char **argv)

cereal::JSONOutputArchive archive(stream);
archive(cereal::make_nvp("image_describer", image_describer));
std::unique_ptr<Regions> regionsType;
image_describer->Allocate(regionsType);
archive(cereal::make_nvp("regions_type", regionsType));
}

{
Expand Down
2 changes: 1 addition & 1 deletion src/software/SfM/main_ComputeFeatures.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ int main(int argc, char **argv)
Timer timer;
Image<unsigned char> imageGray;
C_Progress_display my_progress_bar( sfm_data.getViews().size(),
std::cout, "\n\n", " " , "- EXTRACT FEATURES -\n" );
std::cout, "\n- EXTRACT FEATURES -\n" );
for(Views::const_iterator iterViews = sfm_data.views.begin();
iterViews != sfm_data.views.end();
++iterViews, ++my_progress_bar)
Expand Down
2 changes: 1 addition & 1 deletion src/software/SfM/main_ComputeFeatures_OpenCV.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ int main(int argc, char **argv)
Timer timer;
Image<unsigned char> imageGray;
C_Progress_display my_progress_bar( sfm_data.getViews().size(),
std::cout, "\n\n", " " , "- EXTRACT FEATURES -\n" );
std::cout, "\n- EXTRACT FEATURES -\n" );
for(Views::const_iterator iterViews = sfm_data.views.begin();
iterViews != sfm_data.views.end();
++iterViews, ++my_progress_bar)
Expand Down
4 changes: 2 additions & 2 deletions src/third_party/vectorGraphics/svgDrawer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ struct svgHisto
iter != vec_value.end();
++iter)
{
size_t dist = std::distance(vec_value.begin(), iter);
T val = *iter;
const size_t dist = std::distance(vec_value.begin(), iter);
const T val = *iter;
std::ostringstream os;
os << '(' << range.first + dist/float(n) * (range.second-range.first) << ',' << val << ')';
svgStyle style = svgStyle().fill("blue").stroke("black", 1.0).tooltip(os.str());
Expand Down

0 comments on commit e0e3d63

Please sign in to comment.