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

solved merge conflicts for merge from dev into newlocallab

Browse Source
This commit is contained in:
heckflosse
2017-11-15 16:49:53 +01:00
parent 0ac7744347 3f1e47d3d5
commit 0df571b2db
63 changed files with 1212 additions and 1927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/thumbnail.cc
View File

@@ -141,7 +141,7 @@ void Thumbnail::_generateThumbnailImage ()
if ( tpp == nullptr ) {
quick = false;
tpp = rtengine::Thumbnail::loadFromRaw (fname, ri, sensorType, tw, th, 1, pparams.wb.equal, TRUE, pparams.raw.bayersensor.imageNum);
tpp = rtengine::Thumbnail::loadFromRaw (fname, ri, sensorType, tw, th, 1, pparams.wb.equal, TRUE);
}
cfs.sensortype = sensorType;
@@ -613,7 +613,7 @@ rtengine::IImage8* Thumbnail::processThumbImage (const rtengine::procparams::Pro
if ( cfs.thumbImgType == CacheImageData::QUICK_THUMBNAIL ) {
// RAW internal thumbnail, no profile yet: just do some rotation etc.
image = tpp->quickProcessImage (pparams, h, rtengine::TI_Nearest, scale);
image = tpp->quickProcessImage (pparams, h, rtengine::TI_Nearest);
} else {
// Full thumbnail: apply profile
// image = tpp->processImage (pparams, h, rtengine::TI_Bilinear, cfs.getCamera(), cfs.focalLen, cfs.focalLen35mm, cfs.focusDist, cfs.shutter, cfs.fnumber, cfs.iso, cfs.expcomp, scale );
@@ -884,7 +884,7 @@ void Thumbnail::_saveThumbnail ()
}
// save thumbnail image
tpp->writeImage (getCacheFileName ("images", ""), 1);
tpp->writeImage (getCacheFileName ("images", ""));
// save aehistogram
tpp->writeAEHistogram (getCacheFileName ("aehistograms", ""));