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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/rawimage.cc
View File

@@ -422,10 +422,14 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
raw_image = nullptr; raw_image = nullptr;
//***************** Read ALL raw file info //***************** 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 (); 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) { if (!is_raw) {
fclose(ifp); fclose(ifp);
ifp = nullptr; ifp = nullptr;

7
rtengine/rawimage.h
View File

@@ -307,13 +307,6 @@ public:
return zero_is_bad == 1 ? true : false; return zero_is_bad == 1 ? true : false;
} }
void setFrameNumber(unsigned int frameNum) {
// a single raw file can contain more than one frame.
// Variable is_raw holds the number of frames in the raw file
// use setFrameNumber() to set the number of the frame [0; is_raw - 1] to be processed
shot_select = std::min(std::max(is_raw, 1u) - 1, frameNum);
}
public: public:
// dcraw functions // dcraw functions
void scale_colors() void scale_colors()