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

Merged master into gtk3

Browse Source
This commit is contained in:
Beep6581
2016-02-14 19:37:14 +01:00
parent f5d5083be6 180959fa41
commit e8cfea9fb5
29 changed files with 869 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/batchqueue.cc
View File

@@ -213,7 +213,7 @@ bool BatchQueue::saveBatchQueue ()
{
const auto fileName = Glib::build_filename (options.rtdir, "batch", "queue.csv");
std::ofstream file (fileName, std::ios::trunc);
std::ofstream file (fileName, std::ios::binary | std::ios::trunc);
if (!file.is_open ())
return false;
@@ -252,7 +252,7 @@ bool BatchQueue::loadBatchQueue ()
{
const auto fileName = Glib::build_filename (options.rtdir, "batch", "queue.csv");
std::ifstream file (fileName);
std::ifstream file (fileName, std::ios::binary);
if (file.is_open ()) {
// Yes, it's better to get the lock for the whole file reading,

2
rtgui/cachemanager.cc
View File

@@ -351,7 +351,7 @@ void CacheManager::applyCacheSizeLimitation () const
const auto dirName = Glib::build_filename (baseDir, "data");
const auto dir = Gio::File::create_for_path (dirName);
auto enumerator = dir->enumerate_children ("standard::*,time::*");
auto enumerator = dir->enumerate_children ("standard::name,time::modified");
while (auto file = enumerator->next_file ()) {
files.emplace_back (file->get_name (), file->modification_time ());

6
rtgui/partialpastedlg.h
View File

@@ -67,7 +67,6 @@ public:
// options in color:
Gtk::CheckButton* icm;
Gtk::CheckButton* gam;
Gtk::CheckButton* vibrance;
Gtk::CheckButton* chmixer;
Gtk::CheckButton* blackwhite;
@@ -111,7 +110,6 @@ public:
Gtk::CheckButton* raw_ccSteps;
Gtk::CheckButton* raw_dcb_iterations;
Gtk::CheckButton* raw_dcb_enhance;
//Gtk::CheckButton* raw_all_enhance;
Gtk::CheckButton* raw_lmmse_iterations;
Gtk::CheckButton* df_file;
@@ -129,9 +127,9 @@ public:
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn;
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, prsharpeningConn, perspectiveConn, commonTransConn;
sigc::connection exifchConn, iptcConn, icmConn, gamcsconn;
sigc::connection exifchConn, iptcConn, icmConn;
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn, ff_ClipControlConn;
sigc::connection raw_caredConn, raw_cablueConn, raw_ca_autocorrectConn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn; //,raw_all_enhanceConn
sigc::connection raw_caredConn, raw_cablueConn, raw_ca_autocorrectConn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn;
public:
PartialPasteDlg (const Glib::ustring& title, Gtk::Window* parent);

2
rtgui/retinex.cc
View File

@@ -1328,12 +1328,12 @@ void Retinex::trimValues (rtengine::procparams::ProcParams* pp)
limd->trimValue (pp->retinex.limd);
highl->trimValue (pp->retinex.highl);
baselog->trimValue (pp->retinex.baselog);
// grbl->trimValue(pp->retinex.grbl);
gam->trimValue (pp->retinex.gam);
slope->trimValue (pp->retinex.slope);
highlights->trimValue (pp->retinex.highlights);
shadows->trimValue (pp->retinex.shadows);
}
void Retinex::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve,/* LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI)
{