aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyose <ayosec@gmail.com>2021-05-31 20:53:23 +0100
committerbetaboon <betaboon@0x80.ninja>2021-08-17 15:49:26 +0200
commitc5b7304e93d94c0dee4b07f2741b07b6a9cef5e1 (patch)
tree91179aff73fe6691e519c46280bcdd60e8a98758
parentc20820de2978d92603d029da13c56ddfc79b019f (diff)
downloadr-alacritty-c5b7304e93d94c0dee4b07f2741b07b6a9cef5e1.tar.gz
r-alacritty-c5b7304e93d94c0dee4b07f2741b07b6a9cef5e1.tar.bz2
r-alacritty-c5b7304e93d94c0dee4b07f2741b07b6a9cef5e1.zip
Define MAX_GRAPHIC_DIMENSIONS as a 2-elements array.
-rw-r--r--alacritty_terminal/src/graphics/mod.rs2
-rw-r--r--alacritty_terminal/src/graphics/sixel.rs2
-rw-r--r--alacritty_terminal/src/term/mod.rs4
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<T: EventListener> Handler for Term<T> {
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<T: EventListener> Handler for Term<T> {
}
}
- 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;
}