Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -19,12 +19,14 @@
|
||||
#include "rtengine.h"
|
||||
#include "iccstore.h"
|
||||
#include "color.h"
|
||||
#include "dcp.h"
|
||||
#include "improcfun.h"
|
||||
#include "improccoordinator.h"
|
||||
#include "curves.h"
|
||||
#include "dfmanager.h"
|
||||
#include "ffmanager.h"
|
||||
#include "rtthumbnail.h"
|
||||
#include "../rtgui/profilestore.h"
|
||||
|
||||
namespace rtengine {
|
||||
|
||||
@@ -38,9 +40,14 @@ int init (const Settings* s, Glib::ustring baseDir) {
|
||||
iccStore->init (s->iccDirectory, baseDir + "/iccprofiles");
|
||||
iccStore->findDefaultMonitorProfile();
|
||||
|
||||
dcpStore->init (baseDir + "/dcpprofiles");
|
||||
|
||||
profileStore.init ();
|
||||
ProcParams::init ();
|
||||
CurveFactory::init ();
|
||||
Color::init ();
|
||||
ImProcFunctions::initMunsell();
|
||||
ImProcFunctions::initCache ();
|
||||
Thumbnail::initGamma ();
|
||||
delete lcmsMutex;
|
||||
lcmsMutex = new Glib::Mutex;
|
||||
@@ -52,7 +59,7 @@ int init (const Settings* s, Glib::ustring baseDir) {
|
||||
void cleanup () {
|
||||
|
||||
ProcParams::cleanup ();
|
||||
Color::cleanup ();
|
||||
ImProcFunctions::cleanupCache ();
|
||||
Thumbnail::cleanupGamma ();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user