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

Use glycin devel env auto detection

Browse source 
We don't need to disable the sandbox for development environments
manually anymore. Glycin should take care of that now.
This commit is contained in:
Sophie Herold 2024-07-05 22:29:06 +02:00
parent ae74411983
commit 1b70686105
9 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/decoder/formats/glycin_proxy.rs
View file

@ -52,9 +52,6 @@ impl Glycin {
let mut loader = glycin::Loader::new(file);
loader.apply_transformations(false);
#[cfg(feature = "disable-glycin-sandbox")]
loader.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed));
loader.cancellable(cancellable_);
let image = loader.load().await?;

8
src/decoder/formats/svg.rs
View file

@ -72,9 +72,6 @@ impl Svg {
log::trace!("Setting up SVG loader");
let mut loader = glycin::Loader::new(file);
#[cfg(feature = "disable-glycin-sandbox")]
loader.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed));
loader.cancellable(cancellable.clone());
let image = loader.load().await?;
@ -179,10 +176,7 @@ impl Svg {
height: i32,
) -> anyhow::Result<gdk::Texture> {
#[allow(unused_mut)]
let mut loader = glycin::Loader::new(file.clone());
#[cfg(feature = "disable-glycin-sandbox")]
loader.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed));
let loader = glycin::Loader::new(file.clone());
let image = loader.load().await?;
let frame_request = glycin::FrameRequest::new().scale(width as u32, height as u32);

4
src/editing.rs
View file

@ -58,9 +58,7 @@ impl Queue {
async fn apply(&self, image: LpImage) -> anyhow::Result<()> {
let file = image.file().unwrap();
#[allow(unused_mut)]
let mut editor = glycin::Editor::new(file.clone());
#[cfg(feature = "disable-glycin-sandbox")]
editor.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed));
let editor = glycin::Editor::new(file.clone());
let mut list = Vec::new();
self.operations.rcu(|current_operations| {

4
src/meson.build
View file

@ -31,10 +31,6 @@ if gtk4_x11.found()
cargo_options += [ '--features', 'x11' ]
endif
if get_option('disable-glycin-sandbox')
cargo_options += [ '--features', 'disable-glycin-sandbox' ]
endif
cargo_env = { 'CARGO_HOME': build_root / 'cargo-home' }
cargo_build = custom_target(