liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-10-14 08:34:38 +02:00
parent b19e12732a dfe40677e2
commit 74cc88ff2f
109 changed files with 3299 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtengine/rawimagesource.cc
View File

@@ -914,7 +914,7 @@ DCPProfile *RawImageSource::getDCP (const ColorManagementParams &cmp, ColorTemp
{
DCPProfile *dcpProf = nullptr;
cmsHPROFILE dummy;
findInputProfile (cmp.input, nullptr, (static_cast<const ImageData*> (getMetaData()))->getCamera(), &dcpProf, dummy);
findInputProfile(cmp.input, nullptr, (static_cast<const FramesData*>(getMetaData()))->getCamera(), &dcpProf, dummy);
if (dcpProf == nullptr) {
if (settings->verbose) {
@@ -930,8 +930,8 @@ DCPProfile *RawImageSource::getDCP (const ColorManagementParams &cmp, ColorTemp
void RawImageSource::convertColorSpace (Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb)
{
double pre_mul[3] = { ri->get_pre_mul (0), ri->get_pre_mul (1), ri->get_pre_mul (2) };
colorSpaceConversion (image, cmp, wb, pre_mul, embProfile, camProfile, imatrices.xyz_cam, (static_cast<const ImageData*> (getMetaData()))->getCamera());
double pre_mul[3] = { ri->get_pre_mul(0), ri->get_pre_mul(1), ri->get_pre_mul(2) };
colorSpaceConversion (image, cmp, wb, pre_mul, embProfile, camProfile, imatrices.xyz_cam, (static_cast<const FramesData*>(getMetaData()))->getCamera());
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1705,15 +1705,14 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch)
}
//Load complete Exif informations
RawMetaDataLocation rml;
rml.exifBase = ri->get_exifBase();
rml.ciffBase = ri->get_ciffBase();
rml.ciffLength = ri->get_ciffLen();
idata = new ImageData (fname, &rml);
green (W, H);
red (W, H);
blue (W, H);
// Load complete Exif informations
std::unique_ptr<RawMetaDataLocation> rml(new RawMetaDataLocation (ri->get_exifBase(), ri->get_ciffBase(), ri->get_ciffLen()));
idata = new FramesData (fname, std::move(rml));
idata->setDCRawFrameCount (numFrames);
green(W, H);
red(W, H);
blue(W, H);
//hpmap = allocArray<char>(W, H);
if (plistener) {