From c5b7304e93d94c0dee4b07f2741b07b6a9cef5e1 Mon Sep 17 00:00:00 2001 From: Ayose Date: Mon, 31 May 2021 20:53:23 +0100 Subject: Define MAX_GRAPHIC_DIMENSIONS as a 2-elements array. --- alacritty_terminal/src/graphics/mod.rs | 2 +- alacritty_terminal/src/graphics/sixel.rs | 2 +- alacritty_terminal/src/term/mod.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alacritty_terminal/src/graphics/mod.rs b/alacritty_terminal/src/graphics/mod.rs index 30424c2b..a285228f 100644 --- a/alacritty_terminal/src/graphics/mod.rs +++ b/alacritty_terminal/src/graphics/mod.rs @@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize}; use crate::term::color::Rgb; /// Max allowed dimensions (width, height) for the graphic, in pixels. -pub const MAX_GRAPHIC_DIMENSIONS: (usize, usize) = (4096, 4096); +pub const MAX_GRAPHIC_DIMENSIONS: [usize; 2] = [4096, 4096]; /// Unique identifier for every graphic added to a grid. #[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, Copy, Hash, PartialOrd, Ord)] diff --git a/alacritty_terminal/src/graphics/sixel.rs b/alacritty_terminal/src/graphics/sixel.rs index 221fe7cd..d617e53b 100644 --- a/alacritty_terminal/src/graphics/sixel.rs +++ b/alacritty_terminal/src/graphics/sixel.rs @@ -391,7 +391,7 @@ impl Parser { return Ok(()); } - if width > MAX_GRAPHIC_DIMENSIONS.0 || height > MAX_GRAPHIC_DIMENSIONS.1 { + if width > MAX_GRAPHIC_DIMENSIONS[0] || height > MAX_GRAPHIC_DIMENSIONS[1] { return Err(Error::TooBigImage { width, height }); } diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs index 1336e564..ed2d9498 100644 --- a/alacritty_terminal/src/term/mod.rs +++ b/alacritty_terminal/src/term/mod.rs @@ -1786,7 +1786,7 @@ impl Handler for Term { let (ps, pv) = if pa == 1 || pa == 4 { match pi { 1 => (0, &[sixel::MAX_COLOR_REGISTERS][..]), - 2 => (0, &[MAX_GRAPHIC_DIMENSIONS.0, MAX_GRAPHIC_DIMENSIONS.1][..]), + 2 => (0, &MAX_GRAPHIC_DIMENSIONS[..]), _ => (1, &[][..]), // Report error in Pi } } else { @@ -1815,7 +1815,7 @@ impl Handler for Term { } } - if graphic.width > MAX_GRAPHIC_DIMENSIONS.0 || graphic.height > MAX_GRAPHIC_DIMENSIONS.1 { + if graphic.width > MAX_GRAPHIC_DIMENSIONS[0] || graphic.height > MAX_GRAPHIC_DIMENSIONS[1] { return; } -- cgit