From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Mar 2021 01:45:18 +0000 (+0000)
Subject: shapelib refactoring: Make back an Arc, so we can hand out clones
X-Git-Tag: otter-0.5.0~522
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8fa24d2612205e7f460eb5187a44df69ba3ffe31;p=otter.git

shapelib refactoring: Make back an Arc, so we can hand out clones

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 242558b7..762cfe00 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -150,7 +150,7 @@ pub struct Item {
   descs: IndexVec<DescId, Html>,
   outline: Outline,
   #[serde(default)]
-  back: Option<Box<dyn OccultedPieceTrait>>,
+  back: Option<Arc<dyn OccultedPieceTrait>>,
 }
 
 #[derive(Debug,Serialize,Deserialize)]
@@ -408,6 +408,7 @@ impl Contents {
       faces.push(face);
     } else if let Some(back_spec) = &idata.group.d.back {
       let p = back_spec.load_occult()?;
+      let p = p.into();
       back = Some(p);
     }
     faces.shrink_to_fit();