Merge pull request #358 from DirtyMaster:patch-1

vpisarev · vpisarev · commit bf699c38c79f · 2015-11-03T19:48:02.000Z
diff --git a/modules/ximgproc/src/structured_edge_detection.cpp b/modules/ximgproc/src/structured_edge_detection.cpp
@@ -549,7 +549,9 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
                 offsetY[n] = x2*features.cols*nchannels + y2*nchannels + z;
             }
             // lookup tables for mapping linear index to offset pairs
-
+        #ifdef _OPENMP
+        #pragma omp parallel for
+        #endif
         for (int i = 0; i < height; ++i)
         {
             float *regFeaturesPtr = regFeatures.ptr<float>(i*stride/shrink);
@@ -599,6 +601,9 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
         dstM.setTo(0);
 
         float step = 2.0f * CV_SQR(stride) / CV_SQR(ipSize) / nTreesEval;
+        #ifdef _OPENMP
+        #pragma omp parallel for
+        #endif
         for (int i = 0; i < height; ++i)
         {
             int *pIndex = indexes.ptr<int>(i);

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,9 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection`
`549`	`549`	`offsetY[n] = x2features.colsnchannels + y2*nchannels + z;`
`550`	`550`	`}`
`551`	`551`	`// lookup tables for mapping linear index to offset pairs`
`552`		`-`
	`552`	`+ #ifdef _OPENMP`
	`553`	`+ #pragma omp parallel for`
	`554`	`+ #endif`
`553`	`555`	`for (int i = 0; i < height; ++i)`
`554`	`556`	`{`
`555`	`557`	`float regFeaturesPtr = regFeatures.ptr<float>(istride/shrink);`
`@@ -599,6 +601,9 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection`
`599`	`601`	`dstM.setTo(0);`
`600`	`602`
`601`	`603`	`float step = 2.0f * CV_SQR(stride) / CV_SQR(ipSize) / nTreesEval;`
	`604`	`+ #ifdef _OPENMP`
	`605`	`+ #pragma omp parallel for`
	`606`	`+ #endif`
`602`	`607`	`for (int i = 0; i < height; ++i)`
`603`	`608`	`{`
`604`	`609`	`int *pIndex = indexes.ptr<int>(i);`