Merge pull request #12 from bvssvni/upd

Updated crates.io
image-rs · Dec 29, 2015 · 96ea95f · 96ea95f
2 parents 7cc2b63 + 123a050
commit 96ea95f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "png"
-version = "0.4.0"
+version = "0.4.1"
 license = "MIT"
 description = "PNG decoding library"
 authors = ["nwin <nwin@users.noreply.github.com>"]

diff --git a/examples/show.rs b/examples/show.rs
@@ -70,7 +70,7 @@ fn main_loop(files: Vec<path::PathBuf>) -> io::Result<()> {
         ))
     );
     resize_window(&display, &image);
-    let mut opengl_texture = glium::Texture2d::new(&display, image);
+    let mut opengl_texture = glium::Texture2d::new(&display, image).unwrap();
 
     'main: loop {
         fill_v_flipped(&opengl_texture.as_surface(), &display.draw(), glium::uniforms::MagnifySamplerFilter::Linear);
@@ -85,7 +85,7 @@ fn main_loop(files: Vec<path::PathBuf>) -> io::Result<()> {
                             Some(path) => {
                                 let image = try!(load_image(path));
                                 resize_window(&display, &image);
-                                opengl_texture = glium::Texture2d::new(&display, image);
+                                opengl_texture = glium::Texture2d::new(&display, image).unwrap();
                             },
                             None => break 'main
                         }
@@ -157,4 +157,4 @@ fn main() {
             Err(err) => println!("Error: {}", err)
         }
     }
-}
+}
diff --git a/src/utils.rs b/src/utils.rs
@@ -209,6 +209,7 @@ pub fn copy_memory(src: &[u8], dst: &mut [u8]) {
 /// # Examples
 ///
 /// ```
+/// # #![feature(vec_push_all)]
 /// # #![feature(collections)]
 /// let mut vec = vec![1];
 /// vec.push_all(&[2, 3, 4]);
@@ -248,4 +249,4 @@ fn test_adam7() {
     let it = Adam7Iterator::new(4, 4);
     let passes: Vec<_> = it.collect();
     assert_eq!(&*passes, &[(1, 0, 1), (4, 0, 1), (5, 0, 2), (6, 0, 2), (6, 1, 2), (7, 0, 4), (7, 1, 4)]);
-}
+}