Skip to content

Made imgcodecs optional for ximgproc module. #4054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asmorkalov wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+10 −3
Open

Made imgcodecs optional for ximgproc module. #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/ximgproc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set(the_description "Extended image processing module. It includes edge-aware filters and etc.")
ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs opencv_video WRAP python java objc js)
ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_video OPTIONAL opencv_imgcodecs WRAP python java objc js)
11 changes: 9 additions & 2 deletions modules/ximgproc/src/disparity_filters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@

#include "precomp.hpp"
#include "opencv2/ximgproc/disparity_filter.hpp"
#include "opencv2/imgcodecs.hpp"
#include <math.h>
#include <vector>

#ifdef HAVE_OPENCV_IMGCODECS
# include "opencv2/imgcodecs.hpp"
#endif

namespace cv {
namespace ximgproc {

Expand Down Expand Up @@ -492,8 +495,9 @@ Ptr<DisparityWLSFilter> createDisparityWLSFilterGeneric(bool use_confidence)

#define UNKNOWN_DISPARITY 16320

int readGT(String src_path,OutputArray dst)
int readGT(String src_path, OutputArray dst)
{
#ifdef HAVE_OPENCV_IMGCODECS
Mat src = imread(src_path,IMREAD_UNCHANGED);
dst.create(src.rows,src.cols,CV_16S);
Mat& dstMat = dst.getMatRef();
Expand Down Expand Up @@ -525,6 +529,9 @@ int readGT(String src_path,OutputArray dst)
}
else
return 1;
#else
CV_Error(Error::StsNotImplemented, "The requested function/feature is not implemented");
#endif
}

double computeMSE(InputArray GT, InputArray src, Rect ROI)
Expand Down
Loading