mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Resolve conflicts with main at c645d5fc:
- svg.rs: keep the bounded rasteriser on main's new render() helper,
keep main's rasterize_rgba8, and inflate with bufread::MultiGzDecoder
under the caller's limit.
- psd_import.rs: move the vector preview into main's smart_content().
Main now moves global block data out of the file before layers are
read, so look the native source up in the importer's own copy.
- smart-object rendering, shortcuts, menu dispatch, strokes: take main's
structure and keep the editor intercept and modal checks.
- Parity docs and Cargo.lock: keep both sides.
Adapt to main: explicit imports for the new wildcard_imports lint, a
smaller real-editor acceptance test for cognitive_complexity, the new
Group::frame_stroke field and options()' depth argument.