Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-03-22 23:01:40 -07:00
43 changed files with 1185 additions and 333 deletions

View File

@@ -42,20 +42,20 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
if (ext.lowercase() == "jpg" || ext.lowercase() == "jpeg") {
// int deg = infoFromImage (fname);
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., true);
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., ColorTemp::DEFAULT_OBSERVER, true);
if (tpp) {
data = tpp->getImage8Data();
}
} else if (ext.lowercase() == "png") {
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., true);
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., ColorTemp::DEFAULT_OBSERVER, true);
if (tpp) {
data = tpp->getImage8Data();
}
} else if (ext.lowercase() == "tif" || ext.lowercase() == "tiff") {
// int deg = infoFromImage (fname);
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., true);
tpp = rtengine::Thumbnail::loadFromImage (fname, width, height, 1, 1., ColorTemp::DEFAULT_OBSERVER, true);
if (tpp) {
data = tpp->getImage8Data();