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
2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/rtthumbnail.cc
View File

@@ -915,7 +915,7 @@ IImage8* Thumbnail::quickProcessImage (const procparams::ProcParams& params, int
}
// Full thumbnail processing, second stage if complete profile exists
IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorType sensorType, int rheight, TypeInterpolation interp, const FramesMetaData *metadata, double& myscale)
IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorType sensorType, int rheight, TypeInterpolation interp, const FramesMetaData *metadata, double& myscale, bool forMonitor)
{
unsigned int imgNum = 0;
if (isRaw) {
@@ -1294,8 +1294,13 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
//ipf.colorCurve (labView, labView);
// obtain final image
Image8* readyImg = new Image8 (fw, fh);
ipf.lab2monitorRgb (labView, readyImg);
Image8* readyImg = nullptr;
if (forMonitor) {
readyImg = new Image8 (fw, fh);
ipf.lab2monitorRgb (labView, readyImg);
} else {
readyImg = ipf.lab2rgb(labView, 0, 0, fw, fh, params.icm);
}
delete labView;
delete baseImg;