seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the rust-bindgen crate properly

Browse Source 
Using the changes from @gadomski along with some additional work, to get the
generated bindings working again. Works on macOS and FreeBSD 11. A couple of
hacks are needed for FreeBSD, but nothing too serious.

Changed to use the libc prefix, and changed to use the generated enums.

Fixes #22, #15, and #14

cargo test passes
This commit is contained in:
Nathan Fiedler
2017-04-08 16:03:58 -07:00
parent 4507d07c9c
commit e7054d3e35
14 changed files with 152 additions and 8244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/lib.rs
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 Nathan Fiedler
* Copyright 2015-2017 Nathan Fiedler
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,7 +17,6 @@
extern crate magick_rust;
use magick_rust::{MagickWand, magick_wand_genesis};
use magick_rust::filters::{FilterType};
use std::error::Error;
use std::fs::File;
@ -25,6 +24,10 @@ use std::io::Read;
use std::path::Path;
use std::sync::{Once, ONCE_INIT};
// TODO: nathan does not understand how to expose the FilterTypes without
// this ugliness, his Rust skills are sorely lacking
use magick_rust::bindings;
// Used to make sure MagickWand is initialized exactly once. Note that we
// do not bother shutting down, we simply exit when the tests are done.
static START: Once = ONCE_INIT;
@ -54,7 +57,7 @@ fn test_resize_image() {
1 => 1,
height => height / 2
};
wand.resize_image(halfwidth, halfheight, FilterType::LanczosFilter, 1.0);
wand.resize_image(halfwidth, halfheight, bindings::FilterTypes::LanczosFilter, 1.0);
assert_eq!(256, wand.get_image_width());
assert_eq!(192, wand.get_image_height());
}