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

Fixed gui (thanks to Hombre) and cleaned code a bit

Browse Source
This commit is contained in:
heckflosse
2016-11-03 01:27:56 +01:00
parent 81fa149570
commit 2d730572f5
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/rawimagesource.cc
View File

@@ -1506,9 +1506,21 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
plistener->setProgress (0.0);
}
unsigned int tempImageNum = 16;
do {
tempImageNum --;
unsigned int tempImageNum = 256;
// requesting a subimage which is not available gives subimage 0. We use 256 to access a non existent frame resulting in frame 0
ri = new RawImage(fname);
int errCode = ri->loadRaw (true, tempImageNum, true, plistener, 0.8);
// now tempImageNum is adjusted to the number of last frame
if (errCode) {
return errCode;
}
ri->compress_image();
ri->set_prefilters();
riFrames[0] = ri;
numFrames ++;
while (tempImageNum) {
numFrames ++;
ri = new RawImage(fname);
int errCode = ri->loadRaw (true, tempImageNum, true, plistener, 0.8);
@@ -1520,9 +1532,10 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
riFrames[tempImageNum] = ri;
ri->compress_image();
ri->set_prefilters();
} while (tempImageNum);
tempImageNum --;
}
if(numFrames > 1 ) {
if(numFrames > 1 ) { // this disables multi frame support for Fuji S5 until I found a solution to handle different dimensions
if(riFrames[0]->get_width() != riFrames[1]->get_width() || riFrames[0]->get_height() != riFrames[1]->get_height()) {
numFrames = 1;
}
@@ -1530,6 +1543,8 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
std::cout << "numframes : " << numFrames << std::endl;
ri = riFrames[0];
if (plistener) {
plistener->setProgress (0.9);
}