Merge pull request #13243 from etienne02:3.4

dc80f9d0 · Alexander Alekhin · ad0d812a · 736683ce · dc80f9d0
Commit dc80f9d0 authored Nov 22, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

types_c.h modules/core/include/opencv2/core/types_c.h +1 -1

No files found.
--- a/modules/core/include/opencv2/core/types_c.h
+++ b/modules/core/include/opencv2/core/types_c.h
@@ -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();