diff --git a/Cargo.lock b/Cargo.lock index 493f0fe3..028d3956 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -304,7 +304,7 @@ dependencies = [ "clipboard-win", "image", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-core-graphics", @@ -619,7 +619,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -1209,7 +1209,7 @@ dependencies = [ "bitflags 2.13.1", "block2 0.6.2", "libc", - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -1285,7 +1285,7 @@ dependencies = [ "image", "js-sys", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "parking_lot", @@ -1356,7 +1356,7 @@ dependencies = [ "document-features", "egui", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "objc2-ui-kit 0.3.2", @@ -1413,7 +1413,7 @@ dependencies = [ "jiff", "log", "mimalloc", - "rand 0.10.2", + "rand 0.10.3", "serde", "unicode_names2", ] @@ -1781,9 +1781,9 @@ dependencies = [ [[package]] name = "fearless_simd" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693" +checksum = "f4beca3cb2444e3304ac30843cc091f44ed58932353cd492ce740067bfce6b12" [[package]] name = "file_dialog" @@ -1882,14 +1882,14 @@ dependencies = [ [[package]] name = "fontique" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6688bc1294fe7117d788937b6c53480169b29c566954af490830d4c09da9516a" +checksum = "bbf1df16263783918b7da396077521f92b729ef7c429444dfcf03581f1448b77" dependencies = [ "hashbrown 0.17.1", "linebender_resource_handle", "memmap2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-core-text", "objc2-foundation 0.3.2", @@ -2086,9 +2086,9 @@ dependencies = [ [[package]] name = "glifo" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be" +checksum = "9f1218dedd5348c1b166ec3b8b3cbca49d2f527bd43b3fa072ea5123c523ed3f" dependencies = [ "bytemuck", "foldhash 0.2.0", @@ -2127,7 +2127,7 @@ dependencies = [ "glutin_glx_sys", "glutin_wgl_sys", "libloading", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -2540,9 +2540,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jiff" -version = "0.2.35" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668b7183bd07af9a4885f5c35b0cc5c83c4607a913c16b7e17291832910d2dcc" +checksum = "b2b005715dcbeb0089a3c0dab99f2ff1cc3b2525323552703d648585d342a383" dependencies = [ "defmt", "jiff-core", @@ -2567,9 +2567,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.35" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a69dcb3a21cfb32ce1cd056169337ca284af0766dd766e7878819b251a49204" +checksum = "2cc9817253cf7c7ee4684451bd327e88d6f3658014e54a29198625590650695c" dependencies = [ "jiff-core", "proc-macro2", @@ -3055,9 +3055,9 @@ dependencies = [ [[package]] name = "objc2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8" dependencies = [ "objc2-encode", ] @@ -3086,7 +3086,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.13.1", "block2 0.6.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", @@ -3136,7 +3136,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.13.1", "dispatch2", - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -3147,7 +3147,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ "bitflags 2.13.1", "dispatch2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-io-surface", ] @@ -3213,7 +3213,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.13.1", "block2 0.6.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", ] @@ -3224,7 +3224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ "bitflags 2.13.1", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", ] @@ -3260,7 +3260,7 @@ checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" dependencies = [ "bitflags 2.13.1", "block2 0.6.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-foundation 0.3.2", ] @@ -3284,7 +3284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ "bitflags 2.13.1", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", @@ -3329,7 +3329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.13.1", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", ] @@ -3490,9 +3490,9 @@ dependencies = [ [[package]] name = "parlance" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6937eda350acc1a5d05872c3cbf99fe78619c269096e2be3d4a350058639d5" +checksum = "73072a9470554c8e794778acece2312661218aaabb635600957d952cf01c716e" [[package]] name = "peniko" @@ -3947,9 +3947,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -3999,7 +3999,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135" dependencies = [ - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", "objc2-quartz-core 0.3.2", @@ -4137,7 +4137,7 @@ dependencies = [ "js-sys", "libc", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -4579,9 +4579,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.0" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9be42f50aa861c555654aa3a37f52f4b1074bacf4e48fe0ef7fa584e80f1f0f" +checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b" dependencies = [ "serde", ] @@ -4774,7 +4774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix 1.1.4", "windows-sys 0.61.2", @@ -5194,9 +5194,9 @@ checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode_names2" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c3e18d850bb6ebd57735e5654f0af65e572b05c2397e7b2b1a7c6a792cc29c" +checksum = "8ba646312acace3c9ec35d7404b58214b6fbf17cbb0d040f35a88407c424447f" dependencies = [ "phf 0.11.3", "unicode_names2_generator", @@ -5204,9 +5204,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849744a58c479122ff24910d7ca57f312b62613ef0412dc327776ae6b235d16a" +checksum = "3afbb72a8cff40859641ae4e56679215a15764e5c155a46f0f534611bdc08e0e" dependencies = [ "phf_codegen", "rand 0.8.8", @@ -5325,9 +5325,9 @@ dependencies = [ [[package]] name = "vello_common" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb2141a2bca6e6d598e471fd4d1d7eed8e020aad6a28187edda07f091a325dd" +checksum = "73c2fbe53548bcd25c8ff42f75a93770a8611a16b37bee56d7ef7b44e36027f1" dependencies = [ "bytemuck", "fearless_simd", @@ -5341,9 +5341,9 @@ dependencies = [ [[package]] name = "vello_cpu" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace506ca414548966fcf3c283be94eb1cad8254de488791ee698bf438b0890a9" +checksum = "ed1fec424fbba6acf6cbc78bb526447eb77590d95f40419d598870fe37535212" dependencies = [ "bytemuck", "glifo", @@ -5576,7 +5576,7 @@ dependencies = [ "jni", "log", "ndk-context", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "url", @@ -5726,7 +5726,7 @@ dependencies = [ "naga", "naga-types", "ndk-sys", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", diff --git a/Cargo.toml b/Cargo.toml index 399748f7..a9bd86d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ egui_kittest = { version = "0.37.0", path = "crates/egui_kittest", default-featu egui_system_font_provider = { version = "0.37.0", path = "crates/egui_system_font_provider", default-features = false } eframe = { version = "0.37.0", path = "crates/eframe", default-features = false } -accesskit = "0.25.0" -accesskit_consumer = "0.39.0" -accesskit_winit = "0.34.0" +accesskit = "0.25.1" +accesskit_consumer = "0.39.1" +accesskit_winit = "0.34.1" ahash = { version = "0.8.12", default-features = false, features = [ "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead "std", @@ -94,17 +94,17 @@ ehttp = { version = "0.7.1", default-features = false } enum-map = "3.1" env_logger = { version = "0.11.11", default-features = false } font-types = { version = "0.12.4", default-features = false, features = ["std"] } -fontique = { version = "0.11.1", default-features = false, features = [ +fontique = { version = "0.12.0", default-features = false, features = [ "system", "fontconfig-dlopen", # Load libfontconfig at runtime, so builds don't need its headers ] } glow = "0.17.0" # Can't update to 0.18: wgpu 30's wgpu-hal pins glow 0.17, so bumping splits it into two versions glutin = { version = "0.32.3", default-features = false } glutin-winit = { version = "0.5.0", default-features = false } -harfrust = "0.12.0" # Can't update to 0.13: it needs read-fonts 0.43, but fontique 0.11 pins read-fonts 0.41, so bumping splits read-fonts into two versions +harfrust = "0.12.0" # Can't update to 0.13+: 0.14 needs read-fonts 0.45, but fontique 0.12 pins read-fonts 0.41, so bumping splits read-fonts into two versions image = { version = "0.25.10", default-features = false } # `flate2` is held at 1.1.9 in `Cargo.lock`: 1.1.10 moved to miniz_oxide 0.9, duplicating the 0.8 that png needs itertools = "0.15.0" -jiff = { version = "0.2.35", default-features = false } +jiff = { version = "0.2.38", default-features = false } js-sys = "0.3.103" kittest = { version = "0.5.0" } log = { version = "0.4.34", features = ["std"] } @@ -113,7 +113,7 @@ mime_guess2 = { version = "2.3", default-features = false } mint = "0.5.9" nohash-hasher = "0.2.0" block2 = "0.6.2" -objc2 = "0.6.4" +objc2 = "0.6.5" objc2-app-kit = { version = "0.3.2", default-features = false } objc2-foundation = { version = "0.3.2", default-features = false } objc2-ui-kit = { version = "0.3.2", default-features = false } @@ -125,7 +125,7 @@ pollster = "1.0" profiling = { version = "1.0", default-features = false } puffin = "0.20.0" puffin_http = "0.17.0" -rand = "0.10.2" +rand = "0.10.3" raw-window-handle = "0.6.2" rayon = "1.12" resvg = { version = "0.45.1", default-features = false } # Can't update to 0.46+: it needs tiny-skia 0.12, but winit 0.30's sctk-adwaita 0.10 is stuck on tiny-skia 0.11, so bumping duplicates tiny-skia @@ -133,14 +133,14 @@ rfd = "0.17.2" rmp-serde = "1.3" ron = "0.12.2" self_cell = "1.3" -send_wrapper = "0.6" +send_wrapper = "0.6.0" serde = { version = "1.0", features = ["derive"] } serde_bytes = "0.11.19" similar-asserts = "2.0" skrifa = { version = "0.44.0", default-features = false, features = [ "std", "autohint_shaping", -] } # Can't update to 0.45+: `glifo` (via vello_cpu 0.2) pins skrifa 0.44, so bumping splits skrifa into two versions +] } # Can't update to 0.45+: `glifo` 0.4 (via vello_cpu 0.3) pins skrifa 0.44, so bumping splits skrifa into two versions smallvec = "1.16" smithay-clipboard = "0.7.2" # 0.7.3 pulls smithay-client-toolkit 0.20 (calloop 0.14), duplicating the 0.19/0.13 that winit 0.30 needs static_assertions = "1.1" @@ -151,12 +151,12 @@ thiserror = "2.0" tokio = "1.53" toml = { version = "1.1", default-features = false } type-map = "0.5.1" -unicode_names2 = { version = "3.1", default-features = false } +unicode_names2 = { version = "4.0", default-features = false } unicode-general-category = "1.1" unicode-properties = { version = "0.1.4", default-features = false, features = ["emoji"] } unicode-script = "0.5.8" unicode-segmentation = "1.13" -vello_cpu = { version = "0.2.0", default-features = false, features = [ +vello_cpu = { version = "0.3.0", default-features = false, features = [ "std", "u8_pipeline", "f32_pipeline", diff --git a/crates/epaint/src/text/font_face.rs b/crates/epaint/src/text/font_face.rs index d0666592..3f037428 100644 --- a/crates/epaint/src/text/font_face.rs +++ b/crates/epaint/src/text/font_face.rs @@ -236,7 +236,8 @@ impl FontCell { id: glyph_id.to_u32(), x: origin_x as f32, y: origin_y as f32, - })); + })) + .ok()?; let mut pixmap = vello_cpu::Pixmap::new(canvas_size, canvas_size); ctx.render(&mut pixmap, &mut resources);