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

use size_t and ssize_t types for cross-compilation

Browse Source
This commit is contained in:
Mattis Marjak
2016-05-16 19:03:45 +03:00
parent c08a093dc3
commit 9d2eba64a3
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib.rs
View File

@ -38,6 +38,9 @@ mod bindings { include!(concat!(env!("OUT_DIR"), "/bindings.rs")); }
pub use wand::*;
pub type size_t = ::bindings::size_t;
pub type ssize_t = ::bindings::ssize_t;
/// This function must be called before any other ImageMagick operations
/// are attempted. This function is safe to be called repeatedly.
@ -62,9 +65,9 @@ pub fn magick_wand_terminus() {
}
pub fn magick_query_fonts(pattern: &str) -> Result<Vec<String>, &'static str> {
let mut number_fonts: u64 = 0;
let mut number_fonts: size_t = 0;
let c_string = try!(::std::ffi::CString::new(pattern).map_err(|_| "could not convert to cstring"));
let ptr = unsafe { bindings::MagickQueryFonts(c_string.as_ptr(), &mut number_fonts as *mut _) };
let ptr = unsafe { bindings::MagickQueryFonts(c_string.as_ptr(), &mut number_fonts as *mut size_t) };
if ptr.is_null() {
Err("null ptr returned by magick_query_fonts")
} else {