Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-26 15:37:45 +03:00
parent f07856eab9 223893ea5a
commit 8f4e5c2fb8
20 changed files with 596 additions and 535 deletions
@@ -364,7 +364,7 @@ IplImage;

 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;
 #else
    return _IplImage();