lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imageView: Skip unsupported formats when sliding

Browse source 
If an image with unsupported format is opened directly,
the error is shown.

Closes #92

Part-of: <https://gitlab.gnome.org/Incubator/loupe/-/merge_requests/212>
This commit is contained in:
Sophie Herold 2023-04-28 00:44:04 +02:00 • committed by Marge Bot
parent 8f55668cd6
commit 6db58463bf
5 changed files with 83 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/decoder/formats/heif.rs
View file

@ -23,7 +23,7 @@ use crate::util;
use crate::util::gettext::*;
use crate::util::ToBufRead;
use anyhow::Context;
use anyhow::{anyhow, bail, Context};
use arc_swap::ArcSwap;
use gtk::prelude::*;
use libheif_rs::{ColorProfile, ColorSpace, HeifContext, LibHeif, Plane, RgbChroma};
@ -56,7 +56,7 @@ impl Heif {
let cancellable = gio::Cancellable::new();
let cancellable_ = cancellable.clone();
updater.spawn_error_handled(move || {
updater.clone().spawn_error_handled(move || {
let file_size = file
.query_info(
gio::FILE_ATTRIBUTE_STANDARD_SIZE,
@ -99,9 +99,17 @@ impl Heif {
RgbChroma::Rgb
};
let mut image = LIBHEIF
.decode(&handle, ColorSpace::Rgb(rgb_chroma), None)
.context(gettext("Failed to decode image"))?;
let image_result = LIBHEIF.decode(&handle, ColorSpace::Rgb(rgb_chroma), None);
let mut image = match image_result {
Err(err)
if matches!(err.sub_code, libheif_rs::HeifErrorSubCode::UnsupportedCodec) =>
{
updater.send(DecoderUpdate::UnsupportedFormat);
bail!(anyhow!(err).context(gettext("Unknown image format")));
}
image => image.context(gettext("Failed to decode image"))?,
};
let icc_profile = if let Some(profile) = handle.color_profile_raw() {
if [