Merge ( dcraw made C++ )

This commit is contained in:
ffsup2
2010-11-27 23:38:13 +01:00
parent 7e1e46aee5
commit 20c7a87900
65 changed files with 1399 additions and 607 deletions

View File

@@ -99,7 +99,7 @@ void Thumbnail::_generateThumbnailImage () {
// 2. if we don't find that then just grab the real image.
bool quick = false;
rtengine::RawMetaDataLocation ri;
if ( initial_ )
if ( initial_ && options.internalThumbIfUntouched)
{
quick = true;
tpp = rtengine::Thumbnail::loadQuickFromRaw (fname, ri, tw, th, 1);