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

merged dev into locallab_dev

Browse Source
This commit is contained in:
heckflosse
2017-05-03 14:15:52 +02:00
parent f2f45458be edfea689b8
commit 2492001c50
33 changed files with 1939 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/thumbnail.cc
View File

@@ -26,11 +26,13 @@
#include <glibmm.h>
#include "../rtengine/imagedata.h"
#include <glib/gstdio.h>
#include "../rtengine/dynamicprofile.h"
#include "guiutils.h"
#include "profilestore.h"
#include "batchqueue.h"
#include "extprog.h"
#include "dynamicprofile.h"
#include "profilestorecombobox.h"
#include "md5helper.h"
using namespace rtengine::procparams;
@@ -177,7 +179,7 @@ const ProcParams& Thumbnail::getProcParamsU ()
if (pparamsValid) {
return pparams;
} else {
pparams = *(profileStore.getDefaultProcParams (getType() == FT_Raw));
pparams = *(ProfileStore::getInstance()->getDefaultProcParams (getType() == FT_Raw));
if (pparams.wb.method == "Camera") {
double ct;
@@ -231,7 +233,7 @@ rtengine::procparams::ProcParams* Thumbnail::createProcParamsForUpdate(bool retu
} else {
imageMetaData = rtengine::ImageMetaData::fromFile (fname, nullptr);
}
PartialProfile *pp = loadDynamicProfile(imageMetaData);
PartialProfile *pp = ProfileStore::getInstance()->loadDynamicProfile(imageMetaData);
int err = pp->pparams->save(outFName);
pp->deleteInstance();
delete pp;
@@ -239,7 +241,7 @@ rtengine::procparams::ProcParams* Thumbnail::createProcParamsForUpdate(bool retu
loadProcParams();
}
} else if (create && defProf != DEFPROFILE_DYNAMIC) {
const PartialProfile *p = profileStore.getProfile(defProf);
const PartialProfile *p = ProfileStore::getInstance()->getProfile(defProf);
if (p && !p->pparams->save(outFName)) {
loadProcParams();
}
@@ -315,7 +317,7 @@ void Thumbnail::loadProcParams ()
pparamsValid = false;
pparams.setDefaults();
const PartialProfile *defaultPP = profileStore.getDefaultPartialProfile(getType() == FT_Raw);
const PartialProfile *defaultPP = ProfileStore::getInstance()->getDefaultPartialProfile(getType() == FT_Raw);
defaultPP->applyTo(&pparams);
if (options.paramsLoadLocation == PLL_Input) {
@@ -929,7 +931,7 @@ void Thumbnail::setFileName (const Glib::ustring &fn)
{
fname = fn;
cfs.md5 = cachemgr->getMD5 (fname);
cfs.md5 = ::getMD5 (fname);
}
void Thumbnail::addThumbnailListener (ThumbnailListener* tnl)