Commit fe71b09f authored by Ted Steiner's avatar Ted Steiner
Browse files

sfm module calls imread function, which is in imgcodecs module 

This built correctly before because tests were run with the highgui module enabled.
The sfm module links against the features2d module, which brings in the highgui module as an optional target if enabled.
Through this path, imread was working correctly despite the file including the wrong header and not declaring its linking dependency.
parent 412fd442

modules/sfm/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ ocv_add_module(sfm 
  opencv_calib3d

  opencv_features2d

  opencv_xfeatures2d

  opencv_imgcodecs

  WRAP python

)

modules/sfm/src/libmv_light/libmv/correspondence/nRobustViewMatching.cc

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

// IN THE SOFTWARE.



#include <opencv2/highgui.hpp>

#include <opencv2/imgcodecs.hpp>



#include "libmv/base/vector_utils.h"

#include "libmv/correspondence/feature.h"