Merge pull request #416 from facorread/next-release-devel

AaronErhardt · web-flow · commit eec03a08551a · 2022-09-12T11:13:37.000+02:00
Revert the effects of extraneous commit a92035c
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,4 @@
 
 # Editor/IDE temporary files
 .*.sw*
-.vscode/*
-Cargo.lock
+.vscode/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,18 +2,6 @@
 
 ## Plotters latest
 
-## Plotters 0.3.4 (?)
-
-## Plotters 0.3.3 (2022-08-19)
-
-### Improved
-
-- The EvcxR integration now supports bitmap output. (Thanks to @lisanhu)
-
-### Fixed
-
-- Fix the plotters crate's edition requirement
-
 ## Plotters 0.3.2 (2022-07-05)
 
 - Added
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,4 @@
 [workspace]
 members = ["plotters", "plotters-backend", "plotters-bitmap", "plotters-svg"]
 default-members = ["plotters"]
+
diff --git a/README.md b/README.md
@@ -226,7 +226,7 @@ extern crate plotters;
 use plotters::prelude::*;
 
 let figure = evcxr_figure((640, 480), |root| {
-    root.fill(&WHITE)?;
+    root.fill(&WHITE);
     let mut chart = ChartBuilder::on(&root)
         .caption("y=x^2", ("Arial", 50).into_font())
         .margin(5)
diff --git a/doc-template/latest_version b/doc-template/latest_version
@@ -1 +1 @@
-0.3.3
+0.3.2
diff --git a/plotters-bitmap/Cargo.toml b/plotters-bitmap/Cargo.toml
@@ -18,7 +18,7 @@ gif = { version = "0.11.2", optional = true }
 path = "../plotters-backend"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.image]
-version = "0.24.3"
+version = "0.24.2"
 optional = true
 default-features = false
 features = ["jpeg", "png", "bmp"]
diff --git a/plotters-svg/Cargo.toml b/plotters-svg/Cargo.toml
@@ -14,15 +14,8 @@ readme = "README.md"
 [dependencies.plotters-backend]
 path = "../plotters-backend"
 
-[dependencies.image]
-version = "0.24.2"
-optional = true
-default-features = false
-features = ["jpeg", "png", "bmp"]
-
 [features]
 debug = []
-bitmap_encoder = ["image"]
 
 [dev-dependencies.plotters]
 default_features = false
diff --git a/plotters-svg/src/svg.rs b/plotters-svg/src/svg.rs
@@ -487,19 +487,18 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
         (w, h): (u32, u32),
         src: &'b [u8],
     ) -> Result<(), DrawingErrorKind<Self::ErrorType>> {
-        use image::codecs::png::PngEncoder;
-        use image::ImageEncoder;
+        use image::png::PNGEncoder;
 
         let mut data = vec![0; 0];
 
         {
             let cursor = Cursor::new(&mut data);
 
-            let encoder = PngEncoder::new(cursor);
+            let encoder = PNGEncoder::new(cursor);
 
-            let color = image::ColorType::Rgb8;
+            let color = image::ColorType::RGB(8);
 
-            encoder.write_image(src, w, h, color).map_err(|e| {
+            encoder.encode(src, w, h, color).map_err(|e| {
                 DrawingErrorKind::DrawingError(Error::new(
                     std::io::ErrorKind::Other,
                     format!("Image error: {}", e),
diff --git a/plotters/Cargo.toml b/plotters/Cargo.toml
@@ -2,7 +2,7 @@
 name = "plotters"
 version = "0.4.0"
 authors = ["Hao Hou <haohou302@gmail.com>"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 description = "A Rust drawing library focus on data plotting for both WASM and native applications"
 repository = "https://github.com/plotters-rs/plotters"
@@ -14,7 +14,7 @@ exclude = ["doc-template", "plotters-doc-data"]
 
 [dependencies]
 num-traits = "0.2.14"
-chrono = { version = "0.4.20", optional = true }
+chrono = { version = "0.4.19", optional = true }
 
 [dependencies.plotters-backend]
 path = "../plotters-backend"
@@ -25,7 +25,6 @@ optional = true
 path = "../plotters-bitmap"
 
 [dependencies.plotters-svg]
-version = "^0.3"
 optional = true
 path = "../plotters-svg"
 
@@ -36,7 +35,7 @@ pathfinder_geometry = { version = "0.5.1", optional = true }
 font-kit = { version = "0.11.0", optional = true }
 
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.image]
-version = "0.24.3"
+version = "0.24.2"
 optional = true
 default-features = false
 features = ["jpeg", "png", "bmp"]
@@ -100,16 +99,15 @@ fontconfig-dlopen = ["font-kit/source-fontconfig-dlopen"]
 # Misc
 datetime = ["chrono"]
 evcxr = ["svg_backend"]
-evcxr_bitmap = ["evcxr", "bitmap_backend", "plotters-svg/bitmap_encoder"]
 deprecated_items = [] # Keep some of the deprecated items for backward compatibility
 
 [dev-dependencies]
 itertools = "0.10.0"
 criterion = "0.3.6"
 rayon = "1.5.1"
 serde_json = "1.0.82"
-serde = "1.0.139"
-serde_derive = "1.0.140"
+serde = "1.0.138"
+serde_derive = "1.0.138"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 rand = "0.8.3"
diff --git a/plotters/src/drawing/backend_impl/mocked.rs b/plotters/src/drawing/backend_impl/mocked.rs
@@ -269,13 +269,6 @@ impl DrawingBackend for MockedBackend {
 
 impl Drop for MockedBackend {
     fn drop(&mut self) {
-        // `self.drop_check` is typically a testing function; it can panic.
-        // The current `drop` call may be a part of stack unwinding caused
-        // by another panic. If so, we should never call it.
-        if std::thread::panicking() {
-            return;
-        }
-
         let mut temp = None;
         std::mem::swap(&mut temp, &mut self.drop_check);
 
diff --git a/plotters/src/evcxr.rs b/plotters/src/evcxr.rs
@@ -1,11 +1,7 @@
 use crate::coord::Shift;
 use crate::drawing::{DrawingArea, IntoDrawingArea};
-use plotters_backend::DrawingBackend;
 use plotters_svg::SVGBackend;
 
-#[cfg(feature = "evcxr_bitmap")]
-use plotters_bitmap::BitMapBackend;
-
 /// The wrapper for the generated SVG
 pub struct SVGWrapper(String, String);
 
@@ -44,26 +40,3 @@ pub fn evcxr_figure<
     draw(root).expect("Drawing failure");
     SVGWrapper(buffer, "".to_string())
 }
-
-/// Start drawing an evcxr figure
-#[cfg(feature = "evcxr_bitmap")]
-pub fn evcxr_bitmap_figure<
-    Draw: FnOnce(DrawingArea<BitMapBackend, Shift>) -> Result<(), Box<dyn std::error::Error>>,
->(
-    size: (u32, u32),
-    draw: Draw,
-) -> SVGWrapper {
-    const PIXEL_SIZE : usize = 3;
-    let mut buf = Vec::new();
-    buf.resize((size.0 as usize) * (size.1 as usize) * PIXEL_SIZE, 0);
-    let root = BitMapBackend::with_buffer(&mut buf, size).into_drawing_area();
-    draw(root).expect("Drawing failure");
-    let mut buffer = "".to_string();
-    {
-        let mut svg_root = SVGBackend::with_string(&mut buffer, size);
-        svg_root
-            .blit_bitmap((0, 0), size, &buf)
-            .expect("Failure converting to SVG");
-    }
-    SVGWrapper(buffer, "".to_string())
-}
diff --git a/plotters/src/lib.rs b/plotters/src/lib.rs
@@ -102,7 +102,7 @@ including bitmap, vector graph, piston window, GTK/Cairo and WebAssembly.
     </a>
     <div class="galleryText">
         Real-time Rendering
-        <a href="https://github.com/plotters-rs/plotters-piston/blob/master/examples/cpustat.rs">[code]</a>
+        <a href="https://github.com/plotters-rs/plotters-piston/blob/master/plotters/examples/cpustat.rs">[code]</a>
     </div>
 </div>
 
diff --git a/plotters/src/style/color.rs b/plotters/src/style/color.rs
@@ -76,12 +76,6 @@ impl Color for RGBAColor {
     }
 }
 
-impl From<RGBColor> for RGBAColor {
-    fn from(rgb: RGBColor) -> Self {
-        Self(rgb.0, rgb.1, rgb.2, 1.0)
-    }
-}
-
 /// A color in the given palette
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Default)]
 pub struct PaletteColor<P: Palette>(usize, PhantomData<P>);
diff --git a/plotters/src/test.rs b/plotters/src/test.rs
@@ -12,11 +12,3 @@ fn regression_test_issue_267() {
         .draw_line(p1, p2, &RGBColor(0, 0, 0).stroke_width(0))
         .unwrap();
 }
-
-#[test]
-fn from_trait_impl_rgba_color() {
-    let rgb = RGBColor(1, 2, 3);
-    let c = RGBAColor::from(rgb);
-
-    assert_eq!(c.rgb(), rgb.rgb());
-}
