X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=lib.rs;h=25e275c56e2140f07e6079599278c149b7ec13b4;hb=5a29f2c9665d2d593d70439d51ea7802c9b5d285;hp=765068fb15529fd1ed61ebb010e8857963460943;hpb=7babb28c6782e473dd4302c930880cb147f0ceb8;p=mandelwow.git

diff --git a/lib.rs b/lib.rs
index 765068f..25e275c 100644
--- a/lib.rs
+++ b/lib.rs
@@ -1,14 +1,3 @@
-extern crate cgmath;
-#[macro_use(uniform,program,implement_vertex)]
-extern crate glium;
-extern crate glutin;
-#[cfg(feature = "image")]
-extern crate image;
-extern crate libxm;
-#[cfg(feature = "rust_rocket")]
-extern crate rust_rocket;
-extern crate sdl2;
-
 pub mod bounding_box;
 pub mod cube;
 pub mod mandelwow;
@@ -18,17 +7,18 @@ pub mod support;
 pub mod text;
 pub mod timer;
 
-pub use bounding_box::BoundingBox;
-pub use cube::Cube;
-pub use shaded_cube::ShadedCube;
+pub use crate::bounding_box::BoundingBox;
+pub use crate::cube::Cube;
+pub use crate::shaded_cube::ShadedCube;
 
 #[cfg(feature = "image")]
 pub fn screenshot(display : &glium::Display) {
-    let image: glium::texture::RawImage2d<u8> = display.read_front_buffer();
+    let image: glium::texture::RawImage2d<'_, u8> = display.read_front_buffer().unwrap();
     let image = image::ImageBuffer::from_raw(image.width, image.height, image.data.into_owned()).unwrap();
-    let image = image::DynamicImage::ImageRgba8(image).flipv();
+    let image = image::DynamicImage::ImageRgba8(image).flipv().to_rgb();
+    let image = image::DynamicImage::ImageRgb8(image);
     let mut output = std::fs::File::create(&std::path::Path::new("screenshot.png")).unwrap();
-    image.save(&mut output, image::ImageFormat::PNG).unwrap();
+    image.write_to(&mut output, image::ImageFormat::PNG).unwrap();
 }
 
 #[cfg(not(feature = "image"))]