leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use crate::HashMap in SwashCache

Browse source
This commit is contained in:
Jeremy Soller 2023-12-19 17:02:28 -07:00
parent 430b3abc9f
commit 19b4d8336e
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/swash.rs
View file

@ -1,17 +1,13 @@
// SPDX-License-Identifier: MIT OR Apache-2.0 // SPDX-License-Identifier: MIT OR Apache-2.0
#[cfg(not(feature = "std"))]
use alloc::collections::BTreeMap as Map;
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
use alloc::vec::Vec; use alloc::vec::Vec;
use core::fmt; use core::fmt;
#[cfg(feature = "std")]
use std::collections::HashMap as Map;
use swash::scale::{image::Content, ScaleContext}; use swash::scale::{image::Content, ScaleContext};
use swash::scale::{Render, Source, StrikeWith}; use swash::scale::{Render, Source, StrikeWith};
use swash::zeno::{Format, Vector}; use swash::zeno::{Format, Vector};
use crate::{CacheKey, Color, FontSystem}; use crate::{CacheKey, Color, FontSystem, HashMap};
pub use swash::scale::image::{Content as SwashContent, Image as SwashImage}; pub use swash::scale::image::{Content as SwashContent, Image as SwashImage};
pub use swash::zeno::{Command, Placement}; pub use swash::zeno::{Command, Placement};
@ -93,8 +89,8 @@ fn swash_outline_commands(
/// Cache for rasterizing with the swash scaler /// Cache for rasterizing with the swash scaler
pub struct SwashCache { pub struct SwashCache {
context: ScaleContext, context: ScaleContext,
pub image_cache: Map<CacheKey, Option<SwashImage>>, pub image_cache: HashMap<CacheKey, Option<SwashImage>>,
pub outline_command_cache: Map<CacheKey, Option<Vec<swash::zeno::Command>>>, pub outline_command_cache: HashMap<CacheKey, Option<Vec<swash::zeno::Command>>>,
} }
impl fmt::Debug for SwashCache { impl fmt::Debug for SwashCache {
@ -108,8 +104,8 @@ impl SwashCache {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
context: ScaleContext::new(), context: ScaleContext::new(),
image_cache: Map::new(), image_cache: HashMap::default(),
outline_command_cache: Map::new(), outline_command_cache: HashMap::default(),
} }
} }