Fix non-OpenMP build

This commit is contained in:
Flössie
2019-02-06 06:54:31 +01:00
parent 9210a56ca4
commit 37027e46bd
27 changed files with 364 additions and 14 deletions

View File

@@ -219,10 +219,14 @@ void dfInfo::updateBadPixelList( RawImage *df )
if( df->getSensorType() == ST_BAYER || df->getSensorType() == ST_FUJI_XTRANS ) {
std::vector<badPix> badPixelsTemp;
#ifdef _OPENMP
#pragma omp parallel
#endif
{
std::vector<badPix> badPixelsThread;
#ifdef _OPENMP
#pragma omp for nowait
#endif
for( int row = 2; row < df->get_height() - 2; row++)
for( int col = 2; col < df->get_width() - 2; col++) {
@@ -235,7 +239,9 @@ void dfInfo::updateBadPixelList( RawImage *df )
}
}
#ifdef _OPENMP
#pragma omp critical
#endif
badPixelsTemp.insert(badPixelsTemp.end(), badPixelsThread.begin(), badPixelsThread.end());
}
badPixels.insert(badPixels.end(), badPixelsTemp.begin(), badPixelsTemp.end());