Use c_int for enums without a type alias

Author: ginnyTheCat

src/device.rs

@@ -1,6 +1,6 @@
 use std::ptr;
 use std::{
-    ffi::{c_uint, CString},
+    ffi::{c_int, CString},
     num::NonZero,
 };
 
@@ -16,7 +16,7 @@ use crate::{
 mod native;
 pub use native::NativeDevice;
 
-from_enum! { c_uint,
+from_enum! { c_int,
     #[derive(Debug, Clone, Copy, PartialEq)]
     pub enum BlendMode {
         /* PDF 1.4 -- standard separable */

src/device/native.rs

@@ -771,14 +771,12 @@ unsafe extern "C" fn begin_group<D: NativeDevice>(
     with_rust_device::<D, _>(dev, |dev| {
         let cs = ManuallyDrop::new(Colorspace::from_raw(color_space));
 
-        let blendmode = BlendMode::try_from(blendmode as u32).unwrap();
-
         dev.begin_group(
             area.into(),
             &cs,
             isolated != 0,
             knockout != 0,
-            blendmode,
+            blendmode.try_into().unwrap(),
             alpha,
         );
     });
@@ -891,7 +889,7 @@ unsafe extern "C" fn begin_metatext<D: NativeDevice>(
     text: *const c_char,
 ) {
     with_rust_device::<D, _>(dev, |dev| {
-        let meta = Metatext::try_from(meta as u32).unwrap();
+        let meta = Metatext::try_from(meta).unwrap();
         let text = unsafe { CStr::from_ptr(text) }.to_str().unwrap();
 
         dev.begin_metatext(meta, text);

src/font.rs

@@ -1,12 +1,12 @@
-use std::ffi::{c_uint, CStr, CString};
+use std::ffi::{c_int, CStr, CString};
 use std::fmt;
 use std::str::FromStr;
 
 use mupdf_sys::*;
 
 use crate::{context, from_enum, Buffer, Error, Matrix, Path};
 
-from_enum! { c_uint,
+from_enum! { c_int,
     #[derive(Debug, Clone, Copy, PartialEq)]
     pub enum SimpleFontEncoding {
         Latin = PDF_SIMPLE_ENCODING_LATIN,
@@ -23,7 +23,7 @@ from_enum! { u32,
     }
 }
 
-from_enum! { c_uint,
+from_enum! { c_int,
     #[derive(Debug, Clone, Copy, PartialEq)]
     pub enum CjkFontOrdering {
         AdobeCns = FZ_ADOBE_CNS,

src/lib.rs

@@ -261,7 +261,7 @@ macro_rules! from_enum {
 
             #[allow(non_upper_case_globals)]
             fn try_from(value: $c_type) -> Result<Self, Self::Error> {
-                match value {
+                match value as _ {
                     $($value => Ok(Self::$field),)*
                     _ => Err(Error::UnknownEnumVariant)
                 }

src/pdf/document.rs

@@ -1,5 +1,5 @@
 use std::convert::TryFrom;
-use std::ffi::{c_uint, CStr, CString};
+use std::ffi::{c_int, CStr, CString};
 use std::io::{self, Write};
 use std::ops::{Deref, DerefMut};
 use std::ptr::{self, NonNull};
@@ -27,7 +27,7 @@ bitflags! {
     }
 }
 
-from_enum! { c_uint,
+from_enum! { c_int,
     #[derive(Debug, Copy, Clone, PartialEq)]
     pub enum Encryption {
         Aes128 = PDF_ENCRYPT_AES_128,
@@ -180,7 +180,7 @@ impl PdfWriteOptions {
     }
 
     pub fn encryption(&self) -> Encryption {
-        Encryption::try_from(self.inner.do_encrypt as u32).unwrap()
+        Encryption::try_from(self.inner.do_encrypt).unwrap()
     }
 
     pub fn set_encryption(&mut self, value: Encryption) -> &mut Self {

src/stroke_state.rs

@@ -83,19 +83,19 @@ impl StrokeState {
     }
 
     pub fn start_cap(&self) -> LineCap {
-        LineCap::try_from(unsafe { (*self.inner).start_cap as u32 }).unwrap()
+        LineCap::try_from(unsafe { (*self.inner).start_cap }).unwrap()
     }
 
     pub fn dash_cap(&self) -> LineCap {
-        LineCap::try_from(unsafe { (*self.inner).dash_cap as u32 }).unwrap()
+        LineCap::try_from(unsafe { (*self.inner).dash_cap }).unwrap()
     }
 
     pub fn end_cap(&self) -> LineCap {
-        LineCap::try_from(unsafe { (*self.inner).end_cap as u32 }).unwrap()
+        LineCap::try_from(unsafe { (*self.inner).end_cap }).unwrap()
     }
 
     pub fn line_join(&self) -> LineJoin {
-        LineJoin::try_from(unsafe { (*self.inner).linejoin as u32 }).unwrap()
+        LineJoin::try_from(unsafe { (*self.inner).linejoin }).unwrap()
     }
 
     pub fn line_width(&self) -> f32 {

src/system_font.rs

@@ -99,7 +99,7 @@ pub unsafe extern "C" fn load_system_cjk_font(
         return font;
     }
     if serif == 1 {
-        match CjkFontOrdering::try_from(ordering as u32) {
+        match CjkFontOrdering::try_from(ordering) {
             Ok(CjkFontOrdering::AdobeCns) => {
                 return load_font_by_names(ctx, &["MingLiU"]);
             }
@@ -115,7 +115,7 @@ pub unsafe extern "C" fn load_system_cjk_font(
             Err(_) => {}
         }
     } else {
-        match CjkFontOrdering::try_from(ordering as u32) {
+        match CjkFontOrdering::try_from(ordering) {
             Ok(CjkFontOrdering::AdobeCns) => {
                 return load_font_by_names(ctx, &["DFKaiShu-SB-Estd-BF"]);
             }

src/text.rs

@@ -104,15 +104,17 @@ impl TextSpan {
     }
 
     pub fn markup_dir(&self) -> BidiDirection {
-        unsafe { (*self.inner).markup_dir().try_into().unwrap() }
+        let markup_dir = unsafe { (*self.inner).markup_dir() };
+        (markup_dir as fz_bidi_direction).try_into().unwrap()
     }
 
     pub fn set_markup_dir(&mut self, dir: BidiDirection) {
         unsafe { (*self.inner).set_markup_dir(dir as _) }
     }
 
     pub fn language(&self) -> Language {
-        unsafe { (*self.inner).language().try_into().unwrap() }
+        let lang = unsafe { (*self.inner).language() };
+        (lang as fz_text_language).try_into().unwrap()
     }
 
     pub fn set_language(&mut self, language: Language) {

src/text_page.rs

@@ -1,6 +1,6 @@
 use std::{
     convert::TryInto,
-    ffi::{c_int, c_uint, c_void, CString},
+    ffi::{c_int, c_void, CString},
     io::Read,
     marker::PhantomData,
     ptr::{self, NonNull},
@@ -309,7 +309,7 @@ pub enum SearchHitResponse {
     AbortSearch = 1,
 }
 
-from_enum! { c_uint,
+from_enum! { c_int,
     #[derive(Debug, Clone, Copy, PartialEq)]
     pub enum TextBlockType {
         Text = FZ_STEXT_BLOCK_TEXT,
@@ -327,7 +327,7 @@ pub struct TextBlock<'a> {
 
 impl TextBlock<'_> {
     pub fn r#type(&self) -> TextBlockType {
-        (self.inner.type_ as u32).try_into().unwrap()
+        self.inner.type_.try_into().unwrap()
     }
 
     pub fn bounds(&self) -> Rect {
@@ -336,7 +336,7 @@ impl TextBlock<'_> {
 
     pub fn lines(&self) -> TextLineIter {
         unsafe {
-            if self.inner.type_ == FZ_STEXT_BLOCK_TEXT as i32 {
+            if self.inner.type_ == FZ_STEXT_BLOCK_TEXT as c_int {
                 return TextLineIter {
                     next: self.inner.u.t.first_line,
                     _marker: PhantomData,