nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Fix loading RAW on MacOS

Browse Source 
LibRaw object is too big for stack so needs to be on heap
This commit is contained in:
Dušan Poizl
2022-10-15 09:56:14 +02:00
parent be6e472081
commit 2bc54ea0cc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loadrunable.cpp
+11 -11
View File
@@ -83,17 +83,17 @@ bool loadRAW(const QString path, ImageInfoData &info, RawImage **image)
if(!image) if(!image)
return false; return false;
LibRaw raw; std::unique_ptr<LibRaw> raw = std::make_unique<LibRaw>();
raw.open_file(path.toLocal8Bit().data()); raw->open_file(path.toLocal8Bit().data());
raw.imgdata.params.half_size = true; raw->imgdata.params.half_size = true;
raw.imgdata.params.use_camera_wb = true; raw->imgdata.params.use_camera_wb = true;
raw.imgdata.params.user_flip = 0; raw->imgdata.params.user_flip = 0;
if(raw.unpack()) if(raw->unpack())
return false; return false;
if(image) if(image)
{ {
libraw_rawdata_t rawdata = raw.imgdata.rawdata; libraw_rawdata_t rawdata = raw->imgdata.rawdata;
size_t size = rawdata.sizes.width*rawdata.sizes.height; size_t size = rawdata.sizes.width*rawdata.sizes.height;
std::vector<uint16_t> out; std::vector<uint16_t> out;
@@ -115,14 +115,14 @@ bool loadRAW(const QString path, ImageInfoData &info, RawImage **image)
memcpy((*image)->data(), &out[0], sizeof(uint16_t)*d); memcpy((*image)->data(), &out[0], sizeof(uint16_t)*d);
} }
QString shutterSpeed = QString::number(raw.imgdata.other.shutter); QString shutterSpeed = QString::number(raw->imgdata.other.shutter);
if(raw.imgdata.other.shutter < 1) if(raw->imgdata.other.shutter < 1)
{ {
shutterSpeed = QString("1/%1s").arg(1.0f/raw.imgdata.other.shutter); shutterSpeed = QString("1/%1s").arg(1.0f/raw->imgdata.other.shutter);
} }
//info.append(StringPair(QObject::tr("Width"), QString::number(rawImg->width))); //info.append(StringPair(QObject::tr("Width"), QString::number(rawImg->width)));
//info.append(StringPair(QObject::tr("Height"), QString::number(rawImg->height))); //info.append(StringPair(QObject::tr("Height"), QString::number(rawImg->height)));
info.info.append({QObject::tr("ISO"), QString::number(raw.imgdata.other.iso_speed)}); info.info.append({QObject::tr("ISO"), QString::number(raw->imgdata.other.iso_speed)});
info.info.append({QObject::tr("Shutter speed"), shutterSpeed}); info.info.append({QObject::tr("Shutter speed"), shutterSpeed});
#if LIBRAW_MINOR_VERSION>=19 #if LIBRAW_MINOR_VERSION>=19
// info.append(StringPair(QObject::tr("Camera temperature"), QString::number(raw.imgdata.other.CameraTemperature))); // info.append(StringPair(QObject::tr("Camera temperature"), QString::number(raw.imgdata.other.CameraTemperature)));