diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc index 61388b74c..15aa905a8 100644 --- a/rtengine/FTblockDN.cc +++ b/rtengine/FTblockDN.cc @@ -197,7 +197,6 @@ namespace rtengine { //now we have tile dimensions, overlaps //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -#pragma omp parallel for schedule(dynamic) for (int tiletop=0; tiletop0.01) { mad_L *= noisevar_L*5/(lvl+1); - +//OpenMP here for (int i=0; i (edge, edge, buffer, Wlvl_L, Hlvl_L, 1<<(lvl+1), false); boxblur(sfave, sfave, lvl+2, lvl+2, Wlvl_L, Hlvl_L);//increase smoothness by locally averaging shrinkage - +//OpenMP here for (int i=0; i0.01) { +//OpenMP here for (int i=0; i0.01) { - +//OpenMP here for (int i=0; i void boxblur (T** src, A** dst, int radx, int rady, i } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = (float)src[row][0]/len; @@ -76,6 +77,7 @@ template void boxblur (T** src, A** dst, int radx, int rady, i } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0][col] = temp[0*W+col]/len; @@ -119,6 +121,7 @@ template void boxblur (T* src, A* dst, int radx, int rady, int } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = (float)src[row*W+0]/len; @@ -146,6 +149,7 @@ template void boxblur (T* src, A* dst, int radx, int rady, int } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0*W+col] = temp[0*W+col]/len; @@ -279,6 +283,7 @@ template void boxdev (T* src, T* dst, int radx, int rady, int W, int } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = (float)src[row*W+0]/len; @@ -306,6 +311,7 @@ template void boxdev (T* src, T* dst, int radx, int rady, int W, int } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; tempave[0*W+col] = temp[0*W+col]/len; @@ -337,6 +343,7 @@ template void boxdev (T* src, T* dst, int radx, int rady, int W, int } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = fabs(src[row*W+0]-tempave[row*W+0])/len; @@ -365,6 +372,7 @@ template void boxdev (T* src, T* dst, int radx, int rady, int W, int } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0*W+col] = temp[0*W+col]/len; @@ -409,6 +417,7 @@ template void boxsqblur (T* src, A* dst, int radx, int rady, i } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = SQR((float)src[row*W+0])/len; @@ -436,6 +445,7 @@ template void boxsqblur (T* src, A* dst, int radx, int rady, i } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0*W+col] = temp[0*W+col]/len; @@ -482,6 +492,7 @@ template void boxcorrelate (T* src, A* dst, int dx, int dy, in } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; int rr = MIN(H-1,MAX(0,row+dy)); @@ -517,6 +528,7 @@ template void boxcorrelate (T* src, A* dst, int dx, int dy, in } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0*W+col] = temp[0*W+col]/len; @@ -561,6 +573,7 @@ template void boxabsblur (T* src, A* dst, int radx, int rady, } } else { //horizontal blur +//OpenMP here for (int row = 0; row < H; row++) { int len = radx + 1; temp[row*W+0] = fabs((float)src[row*W+0])/len; @@ -588,6 +601,7 @@ template void boxabsblur (T* src, A* dst, int radx, int rady, } } else { //vertical blur +//OpenMP here for (int col = 0; col < W; col++) { int len = rady + 1; dst[0*W+col] = temp[0*W+col]/len; diff --git a/rtengine/cplx_wavelet_level.h b/rtengine/cplx_wavelet_level.h index 759fa3e2c..4d43ec0d1 100644 --- a/rtengine/cplx_wavelet_level.h +++ b/rtengine/cplx_wavelet_level.h @@ -505,6 +505,7 @@ namespace rtengine { T *buffer = new T[MAX(m_w,m_h)+2*m_pad+skip]; /* filter along columns */ +//OpenMP here for (int j=0; j