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

Merge branch 'dev' into procparams-cleanup

Browse Source
This commit is contained in:
Flössie
2017-11-20 20:40:57 +01:00
parent 5734e546d8 d47e7f67b2
commit b98a3944a6
114 changed files with 2290 additions and 2680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/previewimage.cc
View File

@@ -97,7 +97,7 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
if ((mode == PIM_EmbeddedOrRaw && !tpp) || mode == PIM_ForceRaw) {
RawImageSource rawImage;
int error = rawImage.load(fname, true);
int error = rawImage.load(fname);
if (!error) {
const unsigned char *data = nullptr;
@@ -115,7 +115,7 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
rawImage.preprocess(params.raw, params.lensProf, params.coarse);
rawImage.demosaic(params.raw);
Imagefloat image(fw, fh);
rawImage.getImage (wb, TR_NONE, &image, pp, params.toneCurve, params.icm, params.raw);
rawImage.getImage (wb, TR_NONE, &image, pp, params.toneCurve, params.raw);
rtengine::Image8 output(fw, fh);
rawImage.convertColorSpace(&image, params.icm, wb);
#pragma omp parallel for schedule(dynamic, 10)