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

Moved "Copy metadata unchanged" to PP3, and added "strip metadata" mode

Browse Source 
Fixes #3647
This commit is contained in:
Alberto Griggio
2017-12-29 23:03:44 +01:00
parent 7dea8a3ea8
commit b589254d21
19 changed files with 270 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/paramsedited.cc
View File

@@ -563,6 +563,7 @@ void ParamsEdited::set (bool v)
filmSimulation.enabled = v;
filmSimulation.clutFilename = v;
filmSimulation.strength = v;
metadata.mode = v;
exif = v;
iptc = v;
@@ -1112,6 +1113,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
filmSimulation.enabled = filmSimulation.enabled && p.filmSimulation.enabled == other.filmSimulation.enabled;
filmSimulation.clutFilename = filmSimulation.clutFilename && p.filmSimulation.clutFilename == other.filmSimulation.clutFilename;
filmSimulation.strength = filmSimulation.strength && p.filmSimulation.strength == other.filmSimulation.strength;
metadata.mode = metadata.mode && p.metadata.mode == other.metadata.mode;
// How the hell can we handle that???
// exif = exif && p.exif==other.exif
@@ -3090,6 +3092,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.filmSimulation.strength = dontforceSet && options.baBehav[ADDSET_FILMSIMULATION_STRENGTH] ? toEdit.filmSimulation.strength + mods.filmSimulation.strength : mods.filmSimulation.strength;
}
if (metadata.mode) {
toEdit.metadata.mode = mods.metadata.mode;
}
// Exif changes are added to the existing ones
if (exif)