[Bf-blender-cvs] [d8198b27df2] master: Cleanup: make remaining imbuf headers work in C++

[Jacques Lucke]

Commit: d8198b27df200cd14c9f9d5b55db73dc55f4cb5a
Author: Jacques Lucke
Date:   Mon Mar 2 15:20:13 2020 +0100
Branches: master
https://developer.blender.org/rBd8198b27df200cd14c9f9d5b55db73dc55f4cb5a

Cleanup: make remaining imbuf headers work in C++

===================================================================

M	source/blender/imbuf/IMB_colormanagement.h
M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/imbuf/IMB_imbuf_types.h
M	source/blender/imbuf/IMB_metadata.h
M	source/blender/imbuf/IMB_moviecache.h

===================================================================

diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h
index a94a9797a35..5e5b3e85b38 100644
--- a/source/blender/imbuf/IMB_colormanagement.h
+++ b/source/blender/imbuf/IMB_colormanagement.h
@@ -27,6 +27,10 @@
 #include "BLI_sys_types.h"
 #include "BLI_compiler_compat.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BCM_CONFIG_FILE "config.ocio"
 
 struct ColorManagedColorspaceSettings;
@@ -363,6 +367,10 @@ enum {
   COLOR_ROLE_DATA,
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #include "intern/colormanagement_inline.c"
 
 #endif /* __IMB_COLORMANAGEMENT_H__ */
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 173c8135f96..8ac9b2e2e16 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -56,11 +56,15 @@
 #ifndef __IMB_IMBUF_H__
 #define __IMB_IMBUF_H__
 
-#define IM_MAX_SPACE 64
-
 /* for bool */
 #include "../blenlib/BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IM_MAX_SPACE 64
+
 /**
  *
  * \attention defined in ???
@@ -755,4 +759,8 @@ void IMB_ImBufFromStereo3d(struct Stereo3dFormat *s3d,
                            struct ImBuf **r_ibuf_left,
                            struct ImBuf **r_ibuf_right);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 0568c425e78..3559a7ca387 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -22,6 +22,10 @@
 
 #include "DNA_vec_types.h" /* for rcti */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \file
  * \ingroup imbuf
  * \brief Contains defines and structs used throughout the imbuf module.
@@ -347,4 +351,8 @@ enum {
 
 /** \} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IMB_IMBUF_TYPES_H__ */
diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h
index fc08e17dd96..edbdd7be482 100644
--- a/source/blender/imbuf/IMB_metadata.h
+++ b/source/blender/imbuf/IMB_metadata.h
@@ -24,6 +24,10 @@
 #ifndef __IMB_METADATA_H__
 #define __IMB_METADATA_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct IDProperty;
 struct ImBuf;
 struct anim;
@@ -77,4 +81,8 @@ struct IDProperty *IMB_anim_load_metadata(struct anim *anim);
 typedef void (*IMBMetadataForeachCb)(const char *field, const char *value, void *userdata);
 void IMB_metadata_foreach(struct ImBuf *ibuf, IMBMetadataForeachCb callback, void *userdata);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IMB_METADATA_H__ */
diff --git a/source/blender/imbuf/IMB_moviecache.h b/source/blender/imbuf/IMB_moviecache.h
index 84ad0724b1a..d26ec4d2c2d 100644
--- a/source/blender/imbuf/IMB_moviecache.h
+++ b/source/blender/imbuf/IMB_moviecache.h
@@ -31,6 +31,10 @@
  * Supposed to provide unified cache system for movie clips, sequencer and
  * other movie-related areas */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ImBuf;
 struct MovieCache;
 
@@ -78,4 +82,8 @@ void IMB_moviecacheIter_step(struct MovieCacheIter *iter);
 struct ImBuf *IMB_moviecacheIter_getImBuf(struct MovieCacheIter *iter);
 void *IMB_moviecacheIter_getUserKey(struct MovieCacheIter *iter);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif