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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-11-20 17:50:33 +01:00
parent 333ac99532 aa286a32f9
commit 721972ee72
81 changed files with 2596 additions and 1853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/dcrop.cc
View File

@@ -1187,10 +1187,6 @@ void Crop::update(int todo)
void Crop::freeAll()
{
if (settings->verbose) {
printf("freeallcrop starts %d\n", (int)cropAllocated);
}
if (cropAllocated) {
if (origCrop) {
delete origCrop;
@@ -1267,10 +1263,6 @@ bool check_need_larger_crop_for_lcp_distortion(int fw, int fh, int x, int y, int
bool Crop::setCropSizes(int rcx, int rcy, int rcw, int rch, int skip, bool internal)
{
if (settings->verbose) {
printf("setcropsizes before lock\n");
}
if (!internal) {
cropMutex.lock();
}
@@ -1362,10 +1354,6 @@ bool Crop::setCropSizes(int rcx, int rcy, int rcw, int rch, int skip, bool inter
int cw = skips(bw, skip);
int ch = skips(bh, skip);
if (settings->verbose) {
printf("setsizes starts (%d, %d, %d, %d, %d, %d)\n", orW, orH, trafw, trafh, cw, ch);
}
EditType editType = ET_PIPETTE;
if (const auto editProvider = PipetteBuffer::getDataProvider()) {
@@ -1460,10 +1448,6 @@ bool Crop::setCropSizes(int rcx, int rcy, int rcw, int rch, int skip, bool inter
cropx = bx1;
cropy = by1;
if (settings->verbose) {
printf("setsizes ends\n");
}
if (!internal) {
cropMutex.unlock();
}