Change order of image/raw loading to generate thumbnails
This commit is contained in:
parent
4f4a3d2336
commit
02e8d3f33c
@ -248,6 +248,15 @@ void Thumbnail::_generateThumbnailImage()
|
|||||||
cfs.exifValid = false;
|
cfs.exifValid = false;
|
||||||
cfs.timeValid = false;
|
cfs.timeValid = false;
|
||||||
|
|
||||||
|
// this will load formats supported by imagio (jpg, png, jxl, and tiff)
|
||||||
|
tpp = rtengine::Thumbnail::loadFromImage(fname, tw, th, -1, pparams->wb.equal, pparams->wb.observer);
|
||||||
|
|
||||||
|
if (tpp) {
|
||||||
|
cfs.format = FT_Custom;
|
||||||
|
infoFromImage(fname);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!tpp) {
|
||||||
// RAW works like this:
|
// RAW works like this:
|
||||||
// 1. if we are here it's because we aren't in the cache so load the JPG
|
// 1. if we are here it's because we aren't in the cache so load the JPG
|
||||||
// image out of the RAW. Mark as "quick".
|
// image out of the RAW. Mark as "quick".
|
||||||
@ -278,15 +287,6 @@ void Thumbnail::_generateThumbnailImage()
|
|||||||
cfs.height = tpp->full_height;
|
cfs.height = tpp->full_height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tpp) {
|
|
||||||
// this will load formats supported by imagio (jpg, png, jxl, and tiff)
|
|
||||||
tpp = rtengine::Thumbnail::loadFromImage(fname, tw, th, -1, pparams->wb.equal, pparams->wb.observer);
|
|
||||||
|
|
||||||
if (tpp) {
|
|
||||||
cfs.format = FT_Custom;
|
|
||||||
infoFromImage(fname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tpp) {
|
if (tpp) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user