merged with dev

This commit is contained in:
Alberto Griggio
2017-03-19 21:34:47 +01:00
85 changed files with 5745 additions and 1744 deletions

View File

@@ -138,7 +138,7 @@ void Thumbnail::_generateThumbnailImage ()
if ( tpp == nullptr ) {
quick = false;
tpp = rtengine::Thumbnail::loadFromRaw (fname, ri, tw, th, 1, pparams.wb.equal, TRUE);
tpp = rtengine::Thumbnail::loadFromRaw (fname, ri, tw, th, 1, pparams.wb.equal, TRUE, pparams.raw.bayersensor.imageNum);
}
if (tpp) {