From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 16:45:52 +0000 (+0000)
Subject: hidden fixes: break out FaceTransform::from_group (nfc)
X-Git-Tag: otter-0.4.0~165
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ba251d5cad7083b9ae5107acc9aa67bfc2746323;p=otter.git

hidden fixes: break out FaceTransform::from_group (nfc)

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 6ea82f68..daf1f020 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -190,6 +190,12 @@ impl OutlineTrait for Item { delegate! { to self.outline {
 }}}
 
 impl FaceTransform {
+  fn from_group(d: &GroupDetails) -> Self {
+    let centre = d.centre;
+    let scale = d.scale;
+    FaceTransform { centre, scale: [scale,scale] }
+  }
+
   #[throws(IE)]
   fn write_svgd(&self, f: &mut Html, svgd: &Html) {
     write!(&mut f.0,
@@ -310,10 +316,7 @@ impl Contents {
     let desc = descs.push(idata.d.desc.clone());
     descs.shrink_to_fit();
 
-    let centre = idata.group.d.centre;
-    let scale = idata.group.d.scale;
-
-    let xform = FaceTransform { centre, scale: [scale,scale] };
+    let xform = FaceTransform::from_group(&idata.group.d);
     let mut face = ItemFace { svg, desc, xform };
     let mut faces = index_vec![ face ];
     if idata.group.d.flip {