From 5d85bb9b5b27a938f94ec93780a64fe0057b842d Mon Sep 17 00:00:00 2001 From: Tom Schouten Date: Mon, 28 Nov 2011 21:10:19 +0000 Subject: pdp: merge with zwizwa darcs svn path=/trunk/externals/pdp/; revision=15799 --- modules/image_basic/pdp_constant.c | 2 +- modules/image_basic/pdp_logic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/image_basic') diff --git a/modules/image_basic/pdp_constant.c b/modules/image_basic/pdp_constant.c index ffd8db1..7b482bb 100644 --- a/modules/image_basic/pdp_constant.c +++ b/modules/image_basic/pdp_constant.c @@ -54,7 +54,7 @@ void pdp_constant_value(t_pdp_constant *x, t_floatarg f) if (f>1.0f) f = 1.0f; if (f<-1.0f) f = -1.0f; - x->x_constant = (void *)((s32)(0x7fff * f)); + x->x_constant = (void *)((sptr)(0x7fff * f)); } diff --git a/modules/image_basic/pdp_logic.c b/modules/image_basic/pdp_logic.c index 78b74d6..39d47c8 100644 --- a/modules/image_basic/pdp_logic.c +++ b/modules/image_basic/pdp_logic.c @@ -89,7 +89,7 @@ static void pdp_logic_process_hardthresh(t_pdp_logic *x) static void pdp_logic_set_mask(t_pdp_logic *x, t_floatarg f) { /* using a pointer as a variable hmm? */ - u32 mask = ((u32)f) & 0xffff; + sptr mask = ((sptr)f) & 0xffff; x->x_mask = ((void * )mask); } @@ -98,12 +98,12 @@ static void pdp_logic_set_threshold(t_pdp_logic *x, t_floatarg f) /* using a pointer as a variable hmm? */ if (f<0.0f) f = 0.0f; if (f>1.0f) f = 1.0f; - x->x_mask = (void *)((u32)(((float)0x7fff) * f)); + x->x_mask = (void *)((sptr)(((float)0x7fff) * f)); } static void pdp_logic_set_depth(t_pdp_logic *x, t_floatarg f) { - u32 mask; + sptr mask; int shift = (16 - ((int)f)); if (shift < 0) shift = 0; if (shift > 16) shift = 16; -- cgit v1.2.1