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:
@@ -27,16 +27,29 @@
|
||||
|
||||
class ProfileStore {
|
||||
|
||||
typedef enum {
|
||||
STORESTATE_NOTINITIALIZED,
|
||||
STORESTATE_BEINGINITIALIZED,
|
||||
STORESTATE_INITIALIZED,
|
||||
STORESTATE_DELETED
|
||||
} StoreState;
|
||||
|
||||
Glib::Mutex *parseMutex;
|
||||
StoreState storeState;
|
||||
std::map<Glib::ustring, rtengine::procparams::PartialProfile*> partProfiles;
|
||||
void parseDir (const Glib::ustring& pdir);
|
||||
void _parseProfiles ();
|
||||
|
||||
public:
|
||||
|
||||
ProfileStore();
|
||||
~ProfileStore();
|
||||
bool init ();
|
||||
void parseProfiles ();
|
||||
rtengine::procparams::PartialProfile* getProfile (const Glib::ustring& profname);
|
||||
std::vector<Glib::ustring> getProfileNames ();
|
||||
rtengine::procparams::ProcParams* getDefaultProcParams (bool isRaw);
|
||||
rtengine::procparams::PartialProfile* getDefaultPartialProfile (bool isRaw);
|
||||
};
|
||||
|
||||
extern ProfileStore profileStore;
|
||||
|
Reference in New Issue
Block a user