Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for 32 bit os #115

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix for 32 bit os #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions iui/src/draw/brush.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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,
},
Expand All @@ -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,
},
Expand Down
4 changes: 2 additions & 2 deletions iui/src/draw/strokeparams.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions iui/src/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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::<ui_sys::uiInitOptions>() as u64,
Size: mem::size_of::<ui_sys::uiInitOptions>() as size_t,
};

// Actually start up the library's functionality
Expand Down