piiswrong closed pull request #8757: [ImageIO] Fix image io for opencv3.3 URL: https://github.com/apache/incubator-mxnet/pull/8757
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/plugin/opencv/cv_api.cc b/plugin/opencv/cv_api.cc index 1508de376d..1ca14aa460 100644 --- a/plugin/opencv/cv_api.cc +++ b/plugin/opencv/cv_api.cc @@ -100,7 +100,11 @@ MXNET_DLL int MXCVImdecode(const unsigned char *img, const mx_uint len, ndout.CheckAndAlloc(); cv::Mat buf(1, len, CV_8U, img_cpy); cv::Mat dst(dims[0], dims[1], flag == 0 ? CV_8U : CV_8UC3, ndout.data().dptr_); +#if (CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_MINOR_VERSION >= 3)) + cv::imdecode(buf, flag | cv::IMREAD_IGNORE_ORIENTATION, &dst); +#else cv::imdecode(buf, flag, &dst); +#endif CHECK(!dst.empty()); delete[] img_cpy; }, ndout.ctx(), {}, {ndout.var()}); diff --git a/src/io/image_io.cc b/src/io/image_io.cc index d95e750e79..491370d9a7 100644 --- a/src/io/image_io.cc +++ b/src/io/image_io.cc @@ -156,7 +156,10 @@ void ImdecodeImpl(int flag, bool to_rgb, void* data, size_t size, } else { dst = cv::Mat(out->shape()[0], out->shape()[1], flag == 0 ? CV_8U : CV_8UC3, out->data().dptr_); -#if (CV_MAJOR_VERSION > 2 || (CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >=4)) +#if (CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_MINOR_VERSION >= 3)) + cv::imdecode(buf, flag | cv::IMREAD_IGNORE_ORIENTATION, &dst); + CHECK(!dst.empty()) << "Decoding failed. Invalid image file."; +#elif(CV_MAJOR_VERSION > 2 || (CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4)) cv::imdecode(buf, flag, &dst); CHECK(!dst.empty()) << "Decoding failed. Invalid image file."; #else ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services