Skip to content

Commit

Permalink
fix some typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoulon committed Jan 25, 2016
1 parent 6b8057d commit ccea45e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/openMVG/image/image_container.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Image : public Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic, Eigen::Row

inline Image(const Base& I) { (*this) = I; }
inline Image& operator=(const Base& I) { Base::operator=(I); return *this; }
virtual inline ~Image() {};
virtual inline ~Image() {}
//-- Image construction method
//------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ void GlobalSfMReconstructionEngine_RelativeMotions::Compute_Relative_Rotations
const View * view_I = _sfm_data.views[I].get();
const View * view_J = _sfm_data.views[J].get();

// Check that valid camera are existing for the pair view
// Check that valid cameras are existing for the pair of view
if (_sfm_data.GetIntrinsics().count(view_I->id_intrinsic) == 0 ||
_sfm_data.GetIntrinsics().count(view_J->id_intrinsic) == 0)
continue;
Expand All @@ -548,15 +548,16 @@ void GlobalSfMReconstructionEngine_RelativeMotions::Compute_Relative_Rotations
cam_I->imagePlane_toCameraPlaneError(2.5) *
cam_J->imagePlane_toCameraPlaneError(2.5),
1./2.);
// Since we use normalized features:
const std::pair<size_t, size_t> imageSize_I(1., 1.), imageSize_J(1.,1.);

// Since we use normalized features, we will use unit image size and intrinsic matrix:
const std::pair<size_t, size_t> imageSize(1., 1.);
const Mat3 K = Mat3::Identity();

if (!robustRelativePose(K, K, x1, x2, relativePose_info, imageSize_I, imageSize_J, 256))
if (!robustRelativePose(K, K, x1, x2, relativePose_info, imageSize, imageSize, 256))
{
continue;
}
bool bRefine_using_BA = true;
const bool bRefine_using_BA = true;
if (bRefine_using_BA)
{
// Refine the defined scene
Expand Down
2 changes: 1 addition & 1 deletion src/openMVG/sfm/pipelines/sfm_features_provider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct Features_Provider
}

/// Return the PointFeatures belonging to the View, if the view does not exist
/// it return an empty PointFeature array.
/// it returns an empty PointFeature array.
const features::PointFeatures & getFeatures(const IndexT & id_view) const
{
// Have an empty feature set in order to deal with non existing view_id
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 @@ -109,7 +109,7 @@ class AKAZE_OCV_Image_describer : public Image_describer

memcpy(descriptor.getData(),
m_desc.ptr<typename DescriptorT::bin_type>(cpt),
DescriptorT::static_size*sizeof(typename DescriptorT::bin_type));
DescriptorT::static_size*sizeof(DescriptorT::bin_type));
regionsCasted->Descriptors().push_back(descriptor);
}
}
Expand Down

0 comments on commit ccea45e

Please sign in to comment.