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

30
rtengine/rawimagesource.cc
View File

@@ -475,8 +475,8 @@ RawImageSource::~RawImageSource ()
delete idata;
if (ri) {
delete ri;
for(size_t i = 0; i < numFrames; ++i) {
delete riFrames[i];
}
flushRGB();
@@ -1506,14 +1506,29 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
plistener->setProgress (0.0);
}
ri = new RawImage(fname);
int errCode = ri->loadRaw (true, imageNum, true, plistener, 0.8);
unsigned int tempImageNum = 4;
do {
tempImageNum --;
numFrames ++;
ri = new RawImage(fname);
int errCode = ri->loadRaw (true, tempImageNum, true, plistener, 0.8);
std::cout << "imagenum : " << tempImageNum << " width : " << ri->get_width() << " height : " << ri->get_height() << std::endl;
if (errCode) {
return errCode;
if (errCode) {
return errCode;
}
riFrames[tempImageNum] = ri;
ri->compress_image();
ri->set_prefilters();
} while (tempImageNum);
if(numFrames > 1 ) {
if(riFrames[0]->get_width() != riFrames[1]->get_width() || riFrames[0]->get_height() != riFrames[1]->get_height()) {
numFrames = 1;
}
}
ri->compress_image();
std::cout << "numframes : " << numFrames << std::endl;
if (plistener) {
plistener->setProgress (0.9);
@@ -1627,7 +1642,6 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
}*/
ri->set_prefilters();
//Load complete Exif informations
RawMetaDataLocation rml;