Skip to content
Snippets Groups Projects
Commit 22c7ec8d authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Revert "Fix namespace for SIFT" 

This reverts commit dd454f77.
parent dd454f77
No related branches found
No related tags found
1 merge request!5SIFT has different namespace in Linux and Apple
Pipeline #7203 failed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    src/descriptors/sift/descriptor_sift.h
    + 1
    − 1
    View file @ 22c7ec8d
    ...@@ -48,7 +48,7 @@ inline void DescriptorSIFT::defineDescriptor(const ParamsBasePtr _params) ...@@ -48,7 +48,7 @@ inline void DescriptorSIFT::defineDescriptor(const ParamsBasePtr _params)
    { {
    DescriptorParamsSIFTPtr params_ptr = std::static_pointer_cast<DescriptorParamsSIFT>(_params); DescriptorParamsSIFTPtr params_ptr = std::static_pointer_cast<DescriptorParamsSIFT>(_params);
    descriptor_ = cv::xfeatures2d::SIFT::create(params_ptr->nfeatures, descriptor_ = cv::SIFT::create(params_ptr->nfeatures,
    params_ptr->nOctaveLayers, params_ptr->nOctaveLayers,
    params_ptr->contrastThreshold, params_ptr->contrastThreshold,
    params_ptr->edgeThreshold, params_ptr->edgeThreshold,
    ......
    src/detectors/sift/detector_sift.h
    + 1
    − 1
    View file @ 22c7ec8d
    ...@@ -53,7 +53,7 @@ inline void DetectorSIFT::defineDetector(const ParamsBasePtr _params) ...@@ -53,7 +53,7 @@ inline void DetectorSIFT::defineDetector(const ParamsBasePtr _params)
    { {
    DetectorParamsSIFTPtr params_ptr = std::static_pointer_cast<DetectorParamsSIFT>(_params); DetectorParamsSIFTPtr params_ptr = std::static_pointer_cast<DetectorParamsSIFT>(_params);
    detector_ = cv::xfeatures2d::SIFT::create(params_ptr->nfeatures, detector_ = cv::SIFT::create(params_ptr->nfeatures,
    params_ptr->nOctaveLayers, params_ptr->nOctaveLayers,
    params_ptr->contrastThreshold, params_ptr->contrastThreshold,
    params_ptr->edgeThreshold, params_ptr->edgeThreshold,
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment