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

Merge pull request #7104 from xiota/fix-thumbs

Browse Source 
Change order of image/raw loading to generate thumbnails
This commit is contained in:
Lawrence37
2024-06-22 19:02:33 -07:00
committed by GitHub
parent 0fb21de9dc 02e8d3f33c
commit d492e2fadd
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/thumbnail.cc
View File

@@ -248,6 +248,15 @@ void Thumbnail::_generateThumbnailImage()
cfs.exifValid = 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:
// 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".
@@ -278,15 +287,6 @@ void Thumbnail::_generateThumbnailImage()
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) {