Merge branch 'master' of github.com:38/plotters

Author: 38

src/drawing/backend.rs

@@ -267,9 +267,9 @@ pub trait DrawingBackend: Sized {
                     break;
                 }
                 // FIXME: This assume we have RGB image buffer
-                let r = src[(dx + dy * w) as usize * 3];
-                let g = src[(dx + dy * w) as usize * 3 + 1];
-                let b = src[(dx + dy * w) as usize * 3 + 2];
+                let r = src[(dx + dy * iw) as usize * 3];
+                let g = src[(dx + dy * iw) as usize * 3 + 1];
+                let b = src[(dx + dy * iw) as usize * 3 + 2];
                 let color = crate::style::RGBColor(r, g, b);
                 let result =
                     self.draw_pixel((pos.0 + dx as i32, pos.1 + dy as i32), &color.to_rgba());

src/drawing/backend_impl/bitmap.rs

@@ -998,7 +998,8 @@ impl<'a, P: PixelFormat> DrawingBackend for BitMapBackend<'a, P> {
 impl<P: PixelFormat> Drop for BitMapBackend<'_, P> {
     fn drop(&mut self) {
         if !self.saved {
-            self.present().expect("Unable to save the bitmap");
+            // drop should not panic, so we ignore a failed present
+            let _ = self.present();
         }
     }
 }

src/drawing/backend_impl/canvas.rs

@@ -112,8 +112,8 @@ impl DrawingBackend for CanvasBackend {
             return Ok(());
         }
 
-        self.context
-            .set_stroke_style(&make_canvas_color(style.as_color()));
+        self.context.set_stroke_style(&make_canvas_color(style.as_color()));
+        self.context.set_line_width(style.stroke_width() as f64);
         self.context.begin_path();
         self.context.move_to(f64::from(from.0), f64::from(from.1));
         self.context.line_to(f64::from(to.0), f64::from(to.1));

src/drawing/backend_impl/svg.rs

@@ -124,6 +124,7 @@ impl<'a> SVGBackend<'a> {
             &[
                 ("width", &format!("{}", size.0)),
                 ("height", &format!("{}", size.1)),
+                ("viewBox", &format!("0 0 {} {}", size.0, size.1)),
                 ("xmlns", "http://www.w3.org/2000/svg"),
             ],
             false,
@@ -565,7 +566,8 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
 impl Drop for SVGBackend<'_> {
     fn drop(&mut self) {
         if !self.saved {
-            self.present().expect("Unable to save the SVG image");
+            // drop should not panic, so we ignore a failed present
+            let _ = self.present();
         }
     }
 }