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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Beep6581
2016-05-01 22:49:36 +02:00
parent a47043d6cd add88cc62c
commit 5294d22bd1
11 changed files with 711 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/filmsimulation.cc
View File

@@ -72,7 +72,7 @@ void FilmSimulation::onClutSelected()
if ( getEnabled() && !currentClutFilename.empty() && listener && currentClutFilename != m_oldClutFilename ) {
Glib::ustring clutName, dummy;
splitClutFilename( currentClutFilename, clutName, dummy, dummy );
HaldCLUT::splitClutFilename( currentClutFilename, clutName, dummy, dummy );
listener->panelChanged( EvFilmSimulationFilename, clutName );
m_oldClutFilename = currentClutFilename;
@@ -132,7 +132,7 @@ void FilmSimulation::read( const rtengine::procparams::ProcParams* pp, const Par
if ( !get_inconsistent() && !pp->filmSimulation.enabled ) {
if (options.clutCacheSize == 1) {
clutStore.clearCache();
CLUTStore::getInstance().clearCache();
}
}
@@ -279,7 +279,7 @@ int ClutComboBox::parseDir (const Glib::ustring& path)
for (const auto& entry : entries) {
Glib::ustring name, extension, profileName;
splitClutFilename (entry, name, extension, profileName);
HaldCLUT::splitClutFilename (entry, name, extension, profileName);
extension = extension.casefold ();
if (extension.compare ("tif") != 0 && extension.compare ("png") != 0) {

4
rtgui/preferences.cc
View File

@@ -556,9 +556,9 @@ Gtk::Widget* Preferences::getPerformancePanel ()
clutCacheSizeSB->set_increments (1, 5);
clutCacheSizeSB->set_max_length(2); // Will this be sufficient? :)
#ifdef _OPENMP
clutCacheSizeSB->set_range (1, 2 * omp_get_num_procs());
clutCacheSizeSB->set_range (1, 3 * omp_get_num_procs());
#else
clutCacheSizeSB->set_range (1, 8);
clutCacheSizeSB->set_range (1, 12);
#endif
clutCacheSizeHB->pack_start (*CLUTLl, Gtk::PACK_SHRINK, 0);
clutCacheSizeHB->pack_end (*clutCacheSizeSB, Gtk::PACK_SHRINK, 0);