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

pixelshift: Fixed a bug, cleaned code, parallel decode of frames

Browse Source
This commit is contained in:
heckflosse
2016-11-06 16:42:20 +01:00
parent eaaf841f27
commit 5b455702a2
7 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/rawimage.cc
View File

@@ -398,7 +398,7 @@ skip_block:
}
}
int RawImage::loadRaw (bool loadData, unsigned int &imageNum, bool closeFile, ProgressListener *plistener, double progressRange)
int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, ProgressListener *plistener, double progressRange)
{
ifname = filename.c_str();
image = nullptr;
@@ -426,10 +426,8 @@ int RawImage::loadRaw (bool loadData, unsigned int &imageNum, bool closeFile, Pr
shot_select = imageNum;
identify();
std::cout << "israw : " << is_raw << std::endl;
// in case dcraw didn't handle the above mentioned case...
shot_select = std::min(shot_select, std::max(is_raw, 1u) - 1);
imageNum = shot_select;
if (!is_raw) {
fclose(ifp);