Small corrections to set the number of the frame to be extracted from raw file

This commit is contained in:
heckflosse
2016-11-01 16:46:57 +01:00
parent aca3b5aa82
commit 742d7ee037
2 changed files with 5 additions and 8 deletions

View File

@@ -422,10 +422,14 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
raw_image = nullptr;
//***************** Read ALL raw file info
setFrameNumber(frameNum);
// set the number of the frame to extract. If the number is larger then number of existing frames - 1, dcraw will handle that correctly
shot_select = frameNum;
identify ();
// in case dcraw didn't handle the above mentioned case...
shot_select = std::min(shot_select, std::max(is_raw, 1u) - 1);
if (!is_raw) {
fclose(ifp);
ifp = nullptr;