Fix clang compile issue in ipsharpen.cc without losing omp in sharpenHaloCtrl

rtengine/ipsharpen.cc

@@ -170,7 +170,6 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2, SharpeningParams &s
     // Rest is UNSHARP MASK
     int W = lab->W, H = lab->H;
     float** b3 = nullptr;
-    float** labCopy = nullptr;
 
     if (sharpenParam.edgesonly) {
         b3 = new float*[H];
@@ -180,15 +179,6 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2, SharpeningParams &s
         }
     }
 
-    if (sharpenParam.halocontrol && !sharpenParam.edgesonly) {
-        // We only need the lab channel copy in this special case
-        labCopy = new float*[H];
-
-        for( int i = 0; i < H; i++ ) {
-            labCopy[i] = new float[W];
-        }
-    }
-
 #ifdef _OPENMP
     #pragma omp parallel
 #endif
@@ -200,16 +190,16 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2, SharpeningParams &s
             bilateral<float, float> (lab->L, (float**)b3, b2, W, H, sharpenParam.edges_radius / scale, sharpenParam.edges_tolerance, multiThread);
             gaussianBlur (b3, b2, W, H, sharpenParam.radius / scale);
         }
-
+    }
     float** base = lab->L;
 
     if (sharpenParam.edgesonly) {
         base = b3;
     }
 
-        if (sharpenParam.halocontrol == false) {
+    if (!sharpenParam.halocontrol) {
 #ifdef _OPENMP
-            #pragma omp for
+        #pragma omp parallel for
 #endif
 
         for (int i = 0; i < H; i++)
@@ -223,10 +213,18 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2, SharpeningParams &s
                 lab->L[i][j] = lab->L[i][j] + delta;
             }
     } else {
+        float** labCopy = nullptr;
+
         if (!sharpenParam.edgesonly) {
             // make a deep copy of lab->L
+            labCopy = new float*[H];
+
+            for( int i = 0; i < H; i++ ) {
+                labCopy[i] = new float[W];
+            }
+
 #ifdef _OPENMP
-                #pragma omp for
+            #pragma omp parallel for
 #endif
 
             for( int i = 0; i < H; i++ )
@@ -238,18 +236,15 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2, SharpeningParams &s
         }
 
         sharpenHaloCtrl (lab->L, b2, base, W, H, sharpenParam);
-        }
 
-    } // end parallel
+        if (labCopy) {
-
-    if (sharpenParam.halocontrol && !sharpenParam.edgesonly) {
-        // delete the deep copy
             for( int i = 0; i < H; i++ ) {
                 delete[] labCopy[i];
             }
 
             delete[] labCopy;
         }
+    }
 
     if (sharpenParam.edgesonly) {
         for (int i = 0; i < H; i++) {
@@ -268,7 +263,7 @@ void ImProcFunctions::sharpenHaloCtrl (float** luminance, float** blurmap, float
     float** nL = base;
 
 #ifdef _OPENMP
-    #pragma omp for
+    #pragma omp parallel for
 #endif
 
     for (int i = 2; i < H - 2; i++) {
@@ -940,7 +935,6 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
 
     int W = ncie->W, H = ncie->H;
     float** b3;
-    float** ncieCopy;
 
     if (params->sharpening.edgesonly) {
         b3 = new float*[H];
@@ -950,15 +944,6 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
         }
     }
 
-    if (params->sharpening.halocontrol && !params->sharpening.edgesonly) {
-        // We only need the lab parameter copy in this special case
-        ncieCopy = new float*[H];
-
-        for( int i = 0; i < H; i++ ) {
-            ncieCopy[i] = new float[W];
-        }
-    }
-
 #ifdef _OPENMP
     #pragma omp parallel
 #endif
@@ -970,6 +955,7 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
             bilateral<float, float> (ncie->sh_p, (float**)b3, b2, W, H, params->sharpening.edges_radius / scale, params->sharpening.edges_tolerance, multiThread);
             gaussianBlur (b3, b2, W, H, params->sharpening.radius / scale);
         }
+    }
 
     float** base = ncie->sh_p;
 
@@ -977,9 +963,9 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
         base = b3;
     }
 
-        if (params->sharpening.halocontrol == false) {
+    if (!params->sharpening.halocontrol) {
 #ifdef _OPENMP
-            #pragma omp for
+        #pragma omp parallel for
 #endif
 
         for (int i = 0; i < H; i++)
@@ -996,10 +982,18 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
                 }
             }
     } else {
+        float** ncieCopy = nullptr;
+
         if (!params->sharpening.edgesonly) {
-                // make a deep copy of lab->L
+            // make deep copy of ncie->sh_p
+            ncieCopy = new float*[H];
+
+            for( int i = 0; i < H; i++ ) {
+                ncieCopy[i] = new float[W];
+            }
+
 #ifdef _OPENMP
-                #pragma omp for
+            #pragma omp parallel for
 #endif
 
             for( int i = 0; i < H; i++ )
@@ -1011,18 +1005,15 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
         }
 
         sharpenHaloCtrl (ncie->sh_p, b2, base, W, H, params->sharpening);
-        }
 
-    } // end parallel
+        if(ncieCopy) {
-
-    if (params->sharpening.halocontrol && !params->sharpening.edgesonly) {
-        // delete the deep copy
             for( int i = 0; i < H; i++ ) {
                 delete[] ncieCopy[i];
             }
 
             delete[] ncieCopy;
         }
+    }
 
     if (params->sharpening.edgesonly) {
         for (int i = 0; i < H; i++) {