1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #12360 from alalek:issue_12356

This commit is contained in:
Alexander Alekhin
2018-08-31 12:16:50 +00:00
+2
View File
@@ -396,6 +396,8 @@ static void ApplyExifOrientation(const Mat& buf, Mat& img)
static void*
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;
CvMat *matrix = 0;
Mat temp, *data = &temp;