Преглед на файлове

Move ffi call into a method on png_image

Lucas Stadler преди 10 години
родител
ревизия
e658f0c907
променени са 1 файла, в които са добавени 9 реда и са изтрити 7 реда
  1. 9 7
      rust/coffi/src/main.rs

+ 9 - 7
rust/coffi/src/main.rs

@ -25,6 +25,10 @@ impl png_image {
25 25
        img.version = 1;
26 26
        return img
27 27
    }
28
29
    fn begin_read_from_file(&mut self, file_name: *const u8) -> u32 {
30
        unsafe { png_image_begin_read_from_file(self, file_name) as u32 }
31
    }
28 32
}
29 33
30 34
impl std::fmt::Display for png_image {
@ -52,11 +56,9 @@ fn main() {
52 56
    let x = unsafe { cos(3.1415) };
53 57
    println!("cos(3.1415) = {}", x);
54 58
55
    unsafe {
56
        let mut img = png_image::new();
57
        println!("{}", img);
58
        let res = png_image_begin_read_from_file(&mut img, "mei.png\0".as_ptr());
59
        println!("read_from_file: {}", res);
60
        println!("{}", img);
61
    }
59
    let mut img = png_image::new();
60
    println!("{}", img);
61
    let res = img.begin_read_from_file("mei.png\0".as_ptr());
62
    println!("read_from_file: {}", res);
63
    println!("{}", img);
62 64
}