merge with dev

This commit is contained in:
Desmis
2018-02-15 16:57:23 +01:00
61 changed files with 201 additions and 4414 deletions

View File

@@ -501,7 +501,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
calclum->b(ii>>1,jj>>1) = orig_prev->b(ii,jj);
}
}
imgsrc->convertColorSpace(calclum, params.icm, currWB);//claculate values after colorspace conversion
imgsrc->convertColorSpace(calclum, params.icm, currWB);//calculate values after colorspace conversion
}
int kall=1;