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

Merge branch 'dev' into testoutputprofile

Browse Source
This commit is contained in:
Hombre
2018-06-14 21:47:14 +02:00
parent 404375e313 5a2e6f5f76
commit e2dc8ea2c3
105 changed files with 3703 additions and 2470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rtengine/dcrop.cc
View File

@@ -42,7 +42,7 @@ extern const Settings* settings;
Crop::Crop(ImProcCoordinator* parent, EditDataProvider *editDataProvider, bool isDetailWindow)
: PipetteBuffer(editDataProvider), origCrop(nullptr), laboCrop(nullptr), labnCrop(nullptr),
cropImg (nullptr), cbuf_real (nullptr), transCrop (nullptr), cieCrop (nullptr), cbuffer (nullptr),
cropImg (nullptr), transCrop (nullptr), cieCrop (nullptr),
updating(false), newUpdatePending(false), skip(10),
cropx(0), cropy(0), cropw(-1), croph(-1),
trafx(0), trafy(0), trafw(-1), trafh(-1),
@@ -922,8 +922,8 @@ void Crop::update(int todo)
parent->ipf.MLsharpen(labnCrop);
if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
parent->ipf.MLmicrocontrast(labnCrop);
parent->ipf.sharpening(labnCrop, (float**)cbuffer, params.sharpening);
parent->ipf.MLmicrocontrast (labnCrop);
parent->ipf.sharpening (labnCrop, params.sharpening, parent->sharpMask);
}
}
@@ -1052,7 +1052,7 @@ void Crop::update(int todo)
float d, dj, yb; // not used after this block
parent->ipf.ciecam_02float(cieCrop, float (adap), 1, 2, labnCrop, &params, parent->customColCurve1, parent->customColCurve2, parent->customColCurve3,
dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, d, dj, yb, 1);
dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, d, dj, yb, 1, parent->sharpMask);
} else {
// CIECAM is disabled, we free up its image buffer to save some space
if (cieCrop) {
@@ -1140,16 +1140,6 @@ void Crop::freeAll()
cieCrop = nullptr;
}
if (cbuf_real) {
delete [] cbuf_real;
cbuf_real = nullptr;
}
if (cbuffer) {
delete [] cbuffer;
cbuffer = nullptr;
}
PipetteBuffer::flush();
}
@@ -1327,21 +1317,6 @@ bool Crop::setCropSizes(int rcx, int rcy, int rcw, int rch, int skip, bool inter
cieCrop = nullptr;
}
if (cbuffer) {
delete [] cbuffer;
}
if (cbuf_real) {
delete [] cbuf_real;
}
cbuffer = new float*[croph];
cbuf_real = new float[(croph + 2)*cropw];
for (int i = 0; i < croph; i++) {
cbuffer[i] = cbuf_real + cropw * i + cropw;
}
if (editType == ET_PIPETTE) {
PipetteBuffer::resize(cropw, croph);
} else if (PipetteBuffer::bufferCreated()) {