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

Merge branch 'master' into pixelshift

Browse Source
This commit is contained in:
heckflosse
2017-01-22 23:06:08 +01:00
parent 208c179921 9fbbb052ee
commit 75154f5619
26 changed files with 123 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/procparams.cc
View File

@@ -5475,7 +5475,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "W")) {
crop.w = keyFile.get_integer ("Crop", "W");
crop.w = std::max(keyFile.get_integer("Crop", "W"), 1);
if (pedited) {
pedited->crop.w = true;
@@ -5483,7 +5483,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "H")) {
crop.h = keyFile.get_integer ("Crop", "H");
crop.h = std::max(keyFile.get_integer("Crop", "H"), 1);
if (pedited) {
pedited->crop.h = true;