merge with dev - suppress unused variable

This commit is contained in:
Desmis
2019-02-06 08:48:54 +01:00
29 changed files with 368 additions and 41 deletions

View File

@@ -145,7 +145,9 @@ void ImProcFunctions :: dirpyr_equalizer(float ** src, float ** dst, int srcwidt
}
#ifdef __SSE2__
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < srcheight; i++) {
int j;
@@ -160,7 +162,9 @@ void ImProcFunctions :: dirpyr_equalizer(float ** src, float ** dst, int srcwidt
}
#else
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < srcheight; i++) {
for (int j = 0; j < srcwidth; j++) {
@@ -176,10 +180,14 @@ void ImProcFunctions :: dirpyr_equalizer(float ** src, float ** dst, int srcwidt
}
#ifdef __SSE2__
#ifdef _OPENMP
#pragma omp parallel
#endif
{
__m128 div = _mm_set1_ps(327.68f);
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 0; i < srcheight; i++) {
int j;
@@ -194,7 +202,9 @@ void ImProcFunctions :: dirpyr_equalizer(float ** src, float ** dst, int srcwidt
}
}
#else
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < srcheight; i++) {
for (int j = 0; j < srcwidth; j++) {
@@ -230,7 +240,9 @@ void ImProcFunctions :: dirpyr_equalizer(float ** src, float ** dst, int srcwidt
delete [] tmpHue;
}
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < srcheight; i++)
for (int j = 0; j < srcwidth; j++) {