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

reworked pixelshift code and temporary removed Fuji S5 dual frame support

Browse Source
This commit is contained in:
heckflosse
2016-11-03 00:01:47 +01:00
parent 6276b17be2
commit 89901f4b36
12 changed files with 65 additions and 25 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;
@@ -427,8 +427,10 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
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);