From 736683ce2f133938601b571ae24bf65c429af946 Mon Sep 17 00:00:00 2001 From: Etienne Brateau Date: Thu, 22 Nov 2018 01:39:09 +0100 Subject: [PATCH] Fix missing check part (defined(__cplusplus)) in header types_c.h --- modules/core/include/opencv2/core/types_c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h index d4216e0df4..5f63eb8fb4 100644 --- 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();