Small corrections to set the number of the frame to be extracted from raw file
This commit is contained in:
@@ -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;
|
||||
|
@@ -307,13 +307,6 @@ public:
|
||||
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:
|
||||
// dcraw functions
|
||||
void scale_colors()
|
||||
|
Reference in New Issue
Block a user