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-02-01 11:42:17 +01:00
parent 821c36fb35 478410fa39
commit 92f6e0e1da
16 changed files with 332 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/rtthumbnail.cc
View File

@@ -137,6 +137,7 @@ extern Options options;
namespace rtengine
{
using namespace procparams;
Thumbnail* Thumbnail::loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, double wbEq, bool inspectorMode)
@@ -465,8 +466,8 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
skip--;
}
if (skip < 1) {
skip = 1;
if (skip < 2) {
skip = 2;
}
int hskip = skip, vskip = skip;
@@ -1304,7 +1305,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
readyImg = new Image8 (fw, fh);
ipf.lab2monitorRgb (labView, readyImg);
} else {
readyImg = ipf.lab2rgb(labView, 0, 0, fw, fh, params.icm);
readyImg = ipf.lab2rgb(labView, 0, 0, fw, fh, params.icm, false);
}
delete labView;
delete baseImg;