From 1cb1238f09c75500b1c3c050a05c52bc0d25c5c3 Mon Sep 17 00:00:00 2001 From: David Graham Date: Tue, 2 Dec 2014 21:14:08 -0700 Subject: [PATCH 1/3] Ignore png generated during test runs. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c8ed8ea..90ba599 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /doc /target /Cargo.lock + +test/store.png From eb74c216073abfac866fd963cd6ec35a360d87f2 Mon Sep 17 00:00:00 2001 From: David Graham Date: Tue, 2 Dec 2014 21:15:05 -0700 Subject: [PATCH 2/3] Fix enum namespace. --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 99353b3..c38596a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -244,8 +244,8 @@ mod test { use std::io; use std::io::File; - use super::{ffi, load_png, load_png_from_memory, store_png}; - use super::{RGB8, RGBA8, K8, KA8, Image}; + use super::{ffi, load_png, load_png_from_memory, store_png, Image}; + use super::PixelsByColorType::{RGB8, RGBA8, K8, KA8}; #[test] fn test_valid_png() { From 1f89469790bccdc22f9d861a43049b26452aa87a Mon Sep 17 00:00:00 2001 From: David Graham Date: Mon, 8 Dec 2014 19:48:54 -0700 Subject: [PATCH 3/3] Extract write_png function. --- src/lib.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c38596a..5b7e1b5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -188,10 +188,13 @@ pub fn store_png(img: &mut Image, path: &Path) -> Result<(),String> { Err(e) => return Err(format!("{}", e)) }; - let mut writer = &mut file as &mut io::Writer; + let mut writer = &mut file; + write_png(img, writer) +} +pub fn write_png(img: &mut Image, writer: &mut io::Writer) -> Result<(), String> { // Box it again because a &Trait is too big to fit in a void*. - let writer = &mut writer; + let writer = &writer; unsafe { let mut png_ptr = ffi::png_create_write_struct(&*ffi::png_get_header_ver(ptr::null_mut()),