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

12
rtengine/ffmanager.cc
View File

@@ -130,8 +130,8 @@ void ffInfo::updateRawImage()
if( !pathNames.empty() ) {
std::list<Glib::ustring>::iterator iName = pathNames.begin();
ri = new RawImage(*iName); // First file used also for extra pixels informations (width,height, shutter, filters etc.. )
if( ri->loadRaw(true)) {
unsigned int imageNum = 0;
if( ri->loadRaw(true, imageNum)) {
delete ri;
ri = nullptr;
} else {
@@ -156,7 +156,7 @@ void ffInfo::updateRawImage()
for( ++iName; iName != pathNames.end(); ++iName) {
RawImage* temp = new RawImage(*iName);
if( !temp->loadRaw(true)) {
if( !temp->loadRaw(true,imageNum)) {
temp->compress_image(); //\ TODO would be better working on original, because is temporary
nFiles++;
@@ -192,8 +192,9 @@ void ffInfo::updateRawImage()
}
} else {
ri = new RawImage(pathname);
unsigned int imageNum = 0;
if( ri->loadRaw(true)) {
if( ri->loadRaw(true, imageNum)) {
delete ri;
ri = nullptr;
} else {
@@ -326,7 +327,8 @@ ffInfo* FFManager::addFileInfo (const Glib::ustring& filename, bool pool)
RawImage ri (filename);
int res = ri.loadRaw (false); // Read informations about shot
unsigned int imageNum = 0;
int res = ri.loadRaw (false, imageNum); // Read informations about shot
if (res != 0) {
return nullptr;