diff options
| author | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-28 21:10:19 +0000 |
|---|---|---|
| committer | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-28 21:10:19 +0000 |
| commit | 5d85bb9b5b27a938f94ec93780a64fe0057b842d (patch) | |
| tree | c9cb2d3db6f447db73a45d9d05d0f3079ad8205c /system | |
| parent | 2c0fbbc820e98e404caf49f40fe7e0431cbaa1cd (diff) | |
pdp: merge with zwizwa darcs
svn path=/trunk/externals/pdp/; revision=15799
Diffstat (limited to 'system')
| -rw-r--r-- | system/image/pdp_imageproc_common.c | 8 | ||||
| -rw-r--r-- | system/image/pdp_llconv.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/system/image/pdp_imageproc_common.c b/system/image/pdp_imageproc_common.c index dc6f4e1..1175e7d 100644 --- a/system/image/pdp_imageproc_common.c +++ b/system/image/pdp_imageproc_common.c @@ -136,7 +136,7 @@ void pdp_imageproc_not_process(void *x, u32 width, u32 height, s16 *image) void pdp_imageproc_mask_process(void *x, u32 width, u32 height, s16 *image) { - u32 mask = (u32)x; + uptr mask = (uptr)x; u32 *plane = (u32 *)image; int count = (width * height) >> 1; int i; @@ -279,7 +279,7 @@ void pdp_imageproc_zero_process(void *x, u32 width, u32 height, s16 *image) void pdp_imageproc_constant_process(void *x, u32 width, u32 height, s16 *image) { int i; - u32 value = (u32)x; + uptr value = (uptr)x; u32 *plane = (u32 *)image; int wordsize = (width * height) >> 1; value = (value & 0xffff) | (value << 16); @@ -346,7 +346,7 @@ void pdp_imageproc_zthresh_process(void *x, u32 width, u32 height, s16 *image) void pdp_imageproc_hardthresh_process(void *x, u32 width, u32 height, s16 *image) { int i; - s32 thresh = (s32)x; + uptr thresh = (uptr)x; s32 sign1, isign2, a; s32 *wimage = (s32 *)image; int wsize = (width * height) >> 1; @@ -370,7 +370,7 @@ void pdp_imageproc_hardthresh_process(void *x, u32 width, u32 height, s16 *image void pdp_imageproc_softthresh_process(void *x, u32 width, u32 height, s16 *image) { int i; - s32 thresh = (s32)x; + sptr thresh = (sptr)x; s32 sign1, sign2, a; s32 *wimage = (s32 *)image; int wsize = (width * height) >> 1; diff --git a/system/image/pdp_llconv.c b/system/image/pdp_llconv.c index 7826cfa..e6381fc 100644 --- a/system/image/pdp_llconv.c +++ b/system/image/pdp_llconv.c @@ -69,7 +69,7 @@ static inline int rgb2u(int r, int g, int b) /* swap top to bottom */ static inline void _exchange_row(char *row1, char *row2, int size) { - int mask = ~(sizeof(int)-1); + int mask = ~((unsigned int)sizeof(int)-1); int *irow1 = (int *)row1; int *irow2 = (int *)row2; |