equal
deleted
inserted
replaced
49 impl From<&TemplateDesc> for OutlineTemplate { |
49 impl From<&TemplateDesc> for OutlineTemplate { |
50 fn from(desc: &TemplateDesc) -> Self { |
50 fn from(desc: &TemplateDesc) -> Self { |
51 OutlineTemplate { |
51 OutlineTemplate { |
52 islands: desc.outline_points.iter() |
52 islands: desc.outline_points.iter() |
53 .map(|v| v.iter() |
53 .map(|v| v.iter() |
54 .map(|r| Rect::new(r.x as i32, r.y as i32, r.w, r.h)) |
54 .map(|r| Rect::from_size( |
|
55 Point::new(r.x as i32, r.y as i32), |
|
56 Size::new(r.w as usize, r.h as usize))) |
55 .collect()) |
57 .collect()) |
56 .collect(), |
58 .collect(), |
57 fill_points: desc.fill_points.iter() |
59 fill_points: desc.fill_points.iter() |
58 .map(|p| Point::new(p.x as i32, p.y as i32)) |
60 .map(|p| Point::new(p.x as i32, p.y as i32)) |
59 .collect(), |
61 .collect(), |