Add ability to import JXL images
This commit is contained in:
@@ -212,6 +212,12 @@ void Thumbnail::_generateThumbnailImage ()
|
||||
if (tpp) {
|
||||
cfs.format = FT_Jpeg;
|
||||
}
|
||||
} else if (ext == "jxl") {
|
||||
tpp = rtengine::Thumbnail::loadFromImage (fname, tw, th, -1, pparams->wb.equal);
|
||||
|
||||
if (tpp) {
|
||||
cfs.format = FT_Png;
|
||||
}
|
||||
} else if (ext == "png") {
|
||||
tpp = rtengine::Thumbnail::loadFromImage (fname, tw, th, -1, pparams->wb.equal, pparams->wb.observer);
|
||||
|
||||
@@ -255,6 +261,15 @@ void Thumbnail::_generateThumbnailImage ()
|
||||
}
|
||||
}
|
||||
|
||||
if (!tpp) {
|
||||
// try a custom loader
|
||||
tpp = rtengine::Thumbnail::loadFromImage(fname, tw, th, -1, pparams->wb.equal, true);
|
||||
if (tpp) {
|
||||
cfs.format = FT_Custom;
|
||||
infoFromImage(fname);
|
||||
}
|
||||
}
|
||||
|
||||
if (tpp) {
|
||||
tpp->getAutoWBMultipliers(cfs.redAWBMul, cfs.greenAWBMul, cfs.blueAWBMul);
|
||||
_saveThumbnail ();
|
||||
|
Reference in New Issue
Block a user