Merge branch 'dev' into capture_sharpening

2019-09-01 21:40:27 +02:00
parent a2adf0389b bb97a30058
commit 673b0d31fa
1 changed files with 3 additions and 3 deletions
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1020,12 +1020,12 @@ int RawImageSource::load (const Glib::ustring &fname, bool firstFrameOnly)
        } else {
            numFrames = 6;
        }
-#ifdef _OPENMP99
+#ifdef _OPENMP
        #pragma omp parallel
 #endif
        {
            int errCodeThr = 0;
-#ifdef _OPENMP99
+#ifdef _OPENMP
            #pragma omp for nowait
 #endif
            for(unsigned int i = 0; i < numFrames; ++i) {
@@ -1037,7 +1037,7 @@ int RawImageSource::load (const Glib::ustring &fname, bool firstFrameOnly)
                    errCodeThr = riFrames[i]->loadRaw (true, i + 1);
                }
            }
-#ifdef _OPENMP99
+#ifdef _OPENMP
            #pragma omp critical
 #endif
            {