Basic support for cr2 raw files

This commit is contained in:
2019-08-20 08:26:27 +02:00
parent c14de4913c
commit 9a5027e498
3 changed files with 31 additions and 4 deletions
+28 -3
View File
@@ -1,6 +1,8 @@
#include "imageringlist.h"
#include <QThreadPool>
#include <QDir>
#include <libraw/libraw.h>
#include <QDebug>
using namespace std;
@@ -18,8 +20,31 @@ public:
}
void run()
{
QImage img(m_file);
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img));
if(m_file.endsWith(".CR2", Qt::CaseInsensitive))
{
LibRaw raw;
raw.open_file(m_file.toLocal8Bit().data());
raw.imgdata.params.half_size = true;
raw.imgdata.params.use_camera_wb = true;
raw.imgdata.params.user_flip = 0;
raw.unpack();
raw.dcraw_process();
libraw_processed_image_t *rawImg = raw.dcraw_make_mem_image();
QImage img(rawImg->width, rawImg->height, QImage::Format_RGB888);
qDebug() << rawImg->width << img.width()*3 << img.scanLine(1)-img.scanLine(0);
uint scanLine = rawImg->width*rawImg->colors;
for(uint i=0; i<rawImg->height; i++)
{
memcpy(img.scanLine(i), rawImg->data+(i*scanLine), scanLine);
}
raw.dcraw_clear_mem(rawImg);
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img));
}
else
{
QImage img(m_file);
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img));
}
}
};
@@ -80,7 +105,7 @@ bool ImageRingList::setDir(const QString path, const QString &currentFile)
if(dir.exists())
{
QStringList nameFilter;
nameFilter << "*.jpg" << "*.png";
nameFilter << "*.jpg" << "*.png" << "*.cr2";
QStringList list = dir.entryList(nameFilter, QDir::Files | QDir::Readable, QDir::Name);
QStringList absolutePaths;