diff --git a/loadrunable.cpp b/loadrunable.cpp index c32a7a8..bd2b59c 100644 --- a/loadrunable.cpp +++ b/loadrunable.cpp @@ -11,6 +11,17 @@ LoadRunable::LoadRunable(const QString &file, Image *receiver) : { } +void loadExifEntry(ImageInfoData &info, ExifContent *content, ExifTag tag) +{ + char val[1024]; + ExifEntry *entry = exif_content_get_entry(content, tag); + if(entry) + { + exif_entry_get_value(entry, val, sizeof(val)); + info.append(StringPair(exif_tag_get_title(tag), QString(val))); + } +} + void LoadRunable::run() { if(!m_receiver->isCurrent()) @@ -30,10 +41,16 @@ void LoadRunable::run() raw.imgdata.params.user_flip = 0; raw.unpack(); raw.dcraw_process(); - libraw_data_t *imgdata = &raw.imgdata; + libraw_processed_image_t *rawImg = raw.dcraw_make_mem_image(); QImage img(rawImg->width, rawImg->height, QImage::Format_RGB888); + 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); + } + uint scanLine = rawImg->width*rawImg->colors; for(uint i=0; iheight; i++) { @@ -41,7 +58,11 @@ void LoadRunable::run() } 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("ISO"), QString::number(raw.imgdata.other.iso_speed))); + info.append(StringPair(QObject::tr("ISO"), QString::number(raw.imgdata.other.iso_speed))); + info.append(StringPair(QObject::tr("Shutter speed"), shutterSpeed)); +#if LIBRAW_MINOR_VERSION>=19 + info.append(StringPair(QObject::tr("Camera temperature"), QString::number(raw.imgdata.other.CameraTemperature))); +#endif raw.dcraw_clear_mem(rawImg); QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img), Q_ARG(ImageInfoData, info)); } @@ -53,10 +74,8 @@ void LoadRunable::run() info.append(StringPair(QObject::tr("Height"), QString::number(img.height()))); if(exif) { - char val[1024]; - ExifEntry *entry = exif_content_get_entry(exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS); - exif_entry_get_value(entry, val, sizeof(val)); - info.append(StringPair(QObject::tr("ISO"), QString(val))); + loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS); + loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_SHUTTER_SPEED_VALUE); } QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img), Q_ARG(ImageInfoData, info)); }