mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12360 from alalek:issue_12356

Browse Source
This commit is contained in:
Alexander Alekhin 2018-08-31 12:16:50 +00:00
commit 9e42204e67
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgcodecs/src/loadsave.cpp
View File

@ -396,6 +396,8 @@ static void ApplyExifOrientation(const Mat& buf, Mat& img)
static void* static void*
imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 ) imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 )
{ {
CV_Assert(mat || hdrtype != LOAD_MAT); // mat is required in LOAD_MAT case
IplImage* image = 0; IplImage* image = 0;
CvMat *matrix = 0; CvMat *matrix = 0;
Mat temp, *data = &temp; Mat temp, *data = &temp;