omp.h uses templating; it cannot appear in a C block with c++ compiler

Author: Cristy

coders/tiff.c

@@ -2683,7 +2683,7 @@ static MagickBooleanType WritePTIFImage(const ImageInfo *image_info,
         Property ptif:min-base[x][max-levels].
       */
       RectangleInfo
-        pyramid_geometry = { 0.0, 0.0, 0.0, 0.0 };
+        pyramid_geometry = { 0, 0, 0, 0 };
 
       MagickStatusType flags =
         ParseAbsoluteGeometry(option,&pyramid_geometry);

magick/studio.h

@@ -18,6 +18,11 @@
 #ifndef MAGICKCORE_STUDIO_H
 #define MAGICKCORE_STUDIO_H
 
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+#  include <omp.h>
+#  define MAGICKCORE_OPENMP_SUPPORT  1
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -155,11 +160,6 @@ extern "C" {
 #  define MAGICKCORE_OPENCL_SUPPORT  1
 #endif
 
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-#  include <omp.h>
-#  define MAGICKCORE_OPENMP_SUPPORT  1
-#endif
-
 #if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD
 ssize_t pread(int,void *,size_t,off_t);
 #endif

wand/studio.h

@@ -18,6 +18,11 @@
 #ifndef MAGICKWAND_STUDIO_H
 #define MAGICKWAND_STUDIO_H
 
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+#  include <omp.h>
+#  define MAGICKCORE_OPENMP_SUPPORT  1
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -145,11 +150,6 @@ extern "C" {
 #  define MAGICKCORE_OPENCL_SUPPORT  1
 #endif
 
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-#  include <omp.h>
-#  define MAGICKCORE_OPENMP_SUPPORT  1
-#endif
-
 #if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD
 ssize_t pread(int,void *,size_t,off_t);
 #endif