Merge pull request #13243 from etienne02:3.4

This commit is contained in:
Alexander Alekhin 2018-11-22 16:05:14 +00:00
commit dc80f9d0fb

View File

@ -364,7 +364,7 @@ IplImage;
CV_INLINE IplImage cvIplImage() CV_INLINE IplImage cvIplImage()
{ {
#if !defined(CV__ENABLE_C_API_CTORS) #if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
IplImage self = CV_STRUCT_INITIALIZER; self.nSize = sizeof(IplImage); return self; IplImage self = CV_STRUCT_INITIALIZER; self.nSize = sizeof(IplImage); return self;
#else #else
return _IplImage(); return _IplImage();