Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-10-16 23:26:51 +02:00
53 changed files with 4404 additions and 857 deletions

View File

@@ -1185,6 +1185,7 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
params.icm.working = options.fastexport_icm_working ;
params.icm.output = options.fastexport_icm_output ;
params.icm.outputIntent = options.fastexport_icm_outputIntent ;
params.icm.outputBPC = options.fastexport_icm_outputBPC ;
params.icm.gamma = options.fastexport_icm_gamma ;
params.resize.enabled = options.fastexport_resize_enabled ;
params.resize.scale = options.fastexport_resize_scale ;