Merge pull request opencv#12449 from Nuzhny007:master

Nuzhny007 · alalek · commit 80610ca054a7 · 2018-09-08T23:20:14.000+03:00
* Fixed compilation error WITH_OPENMP under Windows

* Move up OpenMP condition
diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
@@ -410,6 +410,8 @@ namespace
                     });
         }
     };
+#elif defined HAVE_OPENMP
+    typedef ParallelLoopBodyWrapper ProxyLoopBody;
 #elif defined HAVE_GCD
     typedef ParallelLoopBodyWrapper ProxyLoopBody;
     static void block_function(void* context, size_t index)

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,8 @@ namespace`
`410`	`410`	`});`
`411`	`411`	`}`
`412`	`412`	`};`
	`413`	`+#elif defined HAVE_OPENMP`
	`414`	`+ typedef ParallelLoopBodyWrapper ProxyLoopBody;`
`413`	`415`	`#elif defined HAVE_GCD`
`414`	`416`	`typedef ParallelLoopBodyWrapper ProxyLoopBody;`
`415`	`417`	`static void block_function(void* context, size_t index)`