Merge pull request #13243 from etienne02:3.4

7 years ago · dc80f9d0fb
parent ad0d812aa0 736683ce2f
commit dc80f9d0fb
1 changed files with 1 additions and 1 deletions
--- 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();