liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix slowdown for decode of non pixelshift files

Browse Source
This commit is contained in:
heckflosse
2017-03-12 20:39:03 +01:00
parent e2b4623dc5
commit 174949e0f0
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
rtengine/rawimagesource.cc
View File

@@ -1518,32 +1518,39 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
numFrames = ri->getFrameCount();
errCode = 0;
#ifdef _OPENMP
#pragma omp parallel if(numFrames > 1)
#endif
{
int errCodeThr = 0;
#ifdef _OPENMP
#pragma omp for nowait
#endif
for(unsigned int i = 0; i < numFrames; ++i) {
if(i == 0) {
riFrames[i] = ri;
errCodeThr = riFrames[i]->loadRaw (true, i, true, plistener, 0.8);
} else {
riFrames[i] = new RawImage(fname);
errCodeThr = riFrames[i]->loadRaw (true, i);
}
riFrames[i]->compress_image(i);
}
#ifdef _OPENMP
#pragma omp critical
#endif
{
errCode = errCodeThr ? errCodeThr : errCode;
}
}
if(numFrames > 1) {
#ifdef _OPENMP
#pragma omp parallel
#endif
{
int errCodeThr = 0;
#ifdef _OPENMP
#pragma omp for nowait
#endif
for(unsigned int i = 0; i < numFrames; ++i) {
if(i == 0) {
riFrames[i] = ri;
errCodeThr = riFrames[i]->loadRaw (true, i, true, plistener, 0.8);
} else {
riFrames[i] = new RawImage(fname);
errCodeThr = riFrames[i]->loadRaw (true, i);
}
riFrames[i]->compress_image(i);
}
#ifdef _OPENMP
#pragma omp critical
#endif
{
errCode = errCodeThr ? errCodeThr : errCode;
}
}
} else {
riFrames[0] = ri;
errCode = riFrames[0]->loadRaw (true, 0, true, plistener, 0.8);
riFrames[0]->compress_image(0);
}
if(errCode) {
return errCode;
}