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

Fix loading RAW files

Browse Source
This commit is contained in:
Dušan Poizl
2023-09-10 22:14:27 +02:00
parent c0b9194ecc
commit 5955a02175
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loadrunable.cpp
+19 -26
View File
@@ -84,9 +84,6 @@ void printStarModel(int radius, const std::vector<double> &data, const Star &sta
bool loadRAW(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image) bool loadRAW(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image)
{ {
if(!image)
return false;
std::unique_ptr<LibRaw> raw = std::make_unique<LibRaw>(); 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;
@@ -95,37 +92,35 @@ bool loadRAW(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
if(raw->unpack()) if(raw->unpack())
return false; return false;
if(image)
libraw_rawdata_t rawdata = raw->imgdata.rawdata;
size_t size = rawdata.sizes.width*rawdata.sizes.height;
std::vector<uint16_t> out;
out.resize(size);
size_t d = 0;
uint h=rawdata.sizes.top_margin+rawdata.sizes.height;
uint w=rawdata.sizes.left_margin+rawdata.sizes.width;
size_t pitch = rawdata.sizes.raw_pitch/sizeof(uint16_t);
for(size_t i=rawdata.sizes.top_margin;i<h;i++)
{ {
libraw_rawdata_t rawdata = raw->imgdata.rawdata; for(size_t o=rawdata.sizes.left_margin;o<w;o++)
size_t size = rawdata.sizes.width*rawdata.sizes.height;
std::vector<uint16_t> out;
out.resize(size);
size_t d = 0;
uint h=rawdata.sizes.top_margin+rawdata.sizes.height;
uint w=rawdata.sizes.left_margin+rawdata.sizes.width;
size_t pitch = rawdata.sizes.raw_pitch/sizeof(uint16_t);
for(size_t i=rawdata.sizes.top_margin;i<h;i++)
{ {
for(size_t o=rawdata.sizes.left_margin;o<w;o++) uint16_t p = rawdata.raw_image[i*pitch+o];
{ out[d++] = p;
uint16_t p = rawdata.raw_image[i*pitch+o];
out[d++] = p;
}
} }
image = std::make_shared<RawImage>(rawdata.sizes.width, rawdata.sizes.height, 1, RawImage::UINT16);
memcpy(image->data(), &out[0], sizeof(uint16_t)*d);
} }
image = std::make_shared<RawImage>(rawdata.sizes.width, rawdata.sizes.height, 1, RawImage::UINT16);
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.info.append({QObject::tr("Width"), QString::number(raw->imgdata.sizes.width)});
//info.append(StringPair(QObject::tr("Height"), QString::number(rawImg->height))); info.info.append({QObject::tr("Height"), QString::number(raw->imgdata.sizes.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
@@ -368,12 +363,10 @@ void LoadRunable::run()
info.info.append({QObject::tr("Filename"), finfo.fileName()}); info.info.append({QObject::tr("Filename"), finfo.fileName()});
std::shared_ptr<RawImage> rawImage; std::shared_ptr<RawImage> rawImage;
bool raw = false;
timer.start(); timer.start();
if(m_file.endsWith(".CR2", Qt::CaseInsensitive) || m_file.endsWith(".NEF", Qt::CaseInsensitive) || m_file.endsWith(".DNG", Qt::CaseInsensitive)) if(m_file.endsWith(".CR2", Qt::CaseInsensitive) || m_file.endsWith(".NEF", Qt::CaseInsensitive) || m_file.endsWith(".DNG", Qt::CaseInsensitive))
{ {
loadRAW(m_file, info, rawImage); loadRAW(m_file, info, rawImage);
raw = true;
qDebug() << "LoadRAW" << timer.elapsed(); qDebug() << "LoadRAW" << timer.elapsed();
} }
else if(m_file.endsWith(".FIT", Qt::CaseInsensitive) || m_file.endsWith(".FITS", Qt::CaseInsensitive)) else if(m_file.endsWith(".FIT", Qt::CaseInsensitive) || m_file.endsWith(".FITS", Qt::CaseInsensitive))