Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2017-01-22 21:55:05 +01:00
11 changed files with 83 additions and 54 deletions

View File

@@ -326,10 +326,10 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited)
guide->set_active (8);
}
x->set_value (pp->crop.x);
y->set_value (pp->crop.y);
w->set_value (std::max(pp->crop.w,1));
h->set_value (std::max(pp->crop.h,1));
x->set_value(pp->crop.x);
y->set_value(pp->crop.y);
w->set_value(std::max(pp->crop.w, 1));
h->set_value(std::max(pp->crop.h, 1));
nx = pp->crop.x;
ny = pp->crop.y;