diff --git a/loadrunable.cpp b/loadrunable.cpp index a315804..cd32a0b 100644 --- a/loadrunable.cpp +++ b/loadrunable.cpp @@ -83,17 +83,17 @@ bool loadRAW(const QString path, ImageInfoData &info, RawImage **image) if(!image) return false; - LibRaw raw; - raw.open_file(path.toLocal8Bit().data()); - raw.imgdata.params.half_size = true; - raw.imgdata.params.use_camera_wb = true; - raw.imgdata.params.user_flip = 0; - if(raw.unpack()) + std::unique_ptr raw = std::make_unique(); + raw->open_file(path.toLocal8Bit().data()); + raw->imgdata.params.half_size = true; + raw->imgdata.params.use_camera_wb = true; + raw->imgdata.params.user_flip = 0; + if(raw->unpack()) return false; 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; std::vector out; @@ -115,14 +115,14 @@ bool loadRAW(const QString path, ImageInfoData &info, RawImage **image) memcpy((*image)->data(), &out[0], sizeof(uint16_t)*d); } - QString shutterSpeed = QString::number(raw.imgdata.other.shutter); - if(raw.imgdata.other.shutter < 1) + QString shutterSpeed = QString::number(raw->imgdata.other.shutter); + 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("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}); #if LIBRAW_MINOR_VERSION>=19 // info.append(StringPair(QObject::tr("Camera temperature"), QString::number(raw.imgdata.other.CameraTemperature)));