Merge branch 'dev' into browser-preview-applied-pparams

This commit is contained in:
Lawrence Lee
2023-08-29 22:58:51 -07:00
188 changed files with 12449 additions and 21671 deletions

View File

@@ -5634,18 +5634,18 @@ void ImProcFunctions::getAutoExp(const LUTu &histogram, int histcompr, double cl
double ImProcFunctions::getAutoDistor(const Glib::ustring &fname, int thumb_size)
{
if (!fname.empty()) {
rtengine::RawMetaDataLocation ri;
// TODO: std::unique_ptr<> to the rescue
int w_raw = -1, h_raw = thumb_size;
int w_thumb = -1, h_thumb = thumb_size;
eSensorType sensorType = rtengine::ST_NONE;
Thumbnail* thumb = rtengine::Thumbnail::loadQuickFromRaw(fname, ri, sensorType, w_thumb, h_thumb, 1, FALSE);
Thumbnail* thumb = rtengine::Thumbnail::loadQuickFromRaw(fname, sensorType, w_thumb, h_thumb, 1, FALSE);
if (!thumb) {
return 0.0;
}
Thumbnail* raw = rtengine::Thumbnail::loadFromRaw(fname, ri, sensorType, w_raw, h_raw, 1, 1.0, ColorTemp::DEFAULT_OBSERVER, FALSE, nullptr);
Thumbnail* raw = rtengine::Thumbnail::loadFromRaw(fname, sensorType, w_raw, h_raw, 1, 1.0, ColorTemp::DEFAULT_OBSERVER, FALSE, nullptr);
if (!raw) {
delete thumb;