From 97dd6c71720eb6e0b2e1e2960e417a64435c4873 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsson Date: Sat, 2 Oct 2021 01:16:42 +0200 Subject: [PATCH] Fix for 32 bit os --- iui/src/draw/brush.rs | 6 +++--- iui/src/draw/strokeparams.rs | 4 ++-- iui/src/ui.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iui/src/draw/brush.rs b/iui/src/draw/brush.rs index 052d4c748..fde3a7918 100644 --- a/iui/src/draw/brush.rs +++ b/iui/src/draw/brush.rs @@ -1,7 +1,7 @@ use draw::DrawContext; use std::marker::PhantomData; use std::ptr; -use ui_sys::{self, uiDrawBrush}; +use ui_sys::{self, size_t, uiDrawBrush}; pub use ui_sys::uiDrawBrushGradientStop as BrushGradientStop; @@ -58,7 +58,7 @@ impl Brush { Y1: linear_gradient_brush.end_y, OuterRadius: 0.0, Stops: linear_gradient_brush.stops.as_ptr() as *mut BrushGradientStop, - NumStops: linear_gradient_brush.stops.len() as u64, + NumStops: linear_gradient_brush.stops.len() as size_t, }, phantom: PhantomData, }, @@ -77,7 +77,7 @@ impl Brush { Y1: radial_gradient_brush.outer_circle_center_y, OuterRadius: radial_gradient_brush.outer_radius, Stops: radial_gradient_brush.stops.as_ptr() as *mut BrushGradientStop, - NumStops: radial_gradient_brush.stops.len() as u64, + NumStops: radial_gradient_brush.stops.len() as size_t, }, phantom: PhantomData, }, diff --git a/iui/src/draw/strokeparams.rs b/iui/src/draw/strokeparams.rs index 5ef2849b3..854dea6c6 100644 --- a/iui/src/draw/strokeparams.rs +++ b/iui/src/draw/strokeparams.rs @@ -1,7 +1,7 @@ use draw::DrawContext; use std::marker::PhantomData; use std::os::raw::c_double; -use ui_sys::uiDrawStrokeParams; +use ui_sys::{size_t, uiDrawStrokeParams}; pub use ui_sys::uiDrawLineCap as LineCap; pub use ui_sys::uiDrawLineJoin as LineJoin; @@ -31,7 +31,7 @@ impl StrokeParams { Thickness: self.thickness, MiterLimit: self.miter_limit, Dashes: self.dashes.as_ptr() as *mut c_double, - NumDashes: self.dashes.len() as u64, + NumDashes: self.dashes.len() as size_t, DashPhase: self.dash_phase, }, phantom: PhantomData, diff --git a/iui/src/ui.rs b/iui/src/ui.rs index 387865ab0..2b5871ca9 100755 --- a/iui/src/ui.rs +++ b/iui/src/ui.rs @@ -2,7 +2,7 @@ use callback_helpers::{from_void_ptr, to_heap_ptr}; use error::UIError; use ffi_tools; use std::os::raw::{c_int, c_void}; -use ui_sys; +use ui_sys::{self, size_t}; use std::ffi::CStr; use std::marker::PhantomData; @@ -74,7 +74,7 @@ impl UI { unsafe { // Create the magic value needed to init libUI let mut init_options = ui_sys::uiInitOptions { - Size: mem::size_of::() as u64, + Size: mem::size_of::() as size_t, }; // Actually start up the library's functionality