From 5d85bb9b5b27a938f94ec93780a64fe0057b842d Mon Sep 17 00:00:00 2001
From: Tom Schouten <doelie@users.sourceforge.net>
Date: Mon, 28 Nov 2011 21:10:19 +0000
Subject: pdp: merge with zwizwa darcs

svn path=/trunk/externals/pdp/; revision=15799
---
 modules/generic/pdp_rawout.c       | 4 ++--
 modules/image_basic/pdp_constant.c | 2 +-
 modules/image_basic/pdp_logic.c    | 6 +++---
 modules/image_io/pdp_qt.c          | 5 ++++-
 modules/image_io/pdp_v4l.c         | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/generic/pdp_rawout.c b/modules/generic/pdp_rawout.c
index e001b37..1163a28 100644
--- a/modules/generic/pdp_rawout.c
+++ b/modules/generic/pdp_rawout.c
@@ -242,8 +242,8 @@ static t_int *rawout_perform(t_int *w);
 static void rawout_dsp(t_rawout *x, t_signal **sp){
     int nargs = 2 + x->x_chans;
     t_int args[nargs];
-    args[0] = (int)x;
-    args[1] = (int)sp[0]->s_n;
+    args[0] = (t_int)x;
+    args[1] = (t_int)sp[0]->s_n;
     float **in = (float **)(args+2);
     int i;
     for (i=0; i<x->x_chans; i++) in[i] = sp[i]->s_vec;
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;
diff --git a/modules/image_io/pdp_qt.c b/modules/image_io/pdp_qt.c
index a46bf45..5802303 100644
--- a/modules/image_io/pdp_qt.c
+++ b/modules/image_io/pdp_qt.c
@@ -26,9 +26,12 @@
 
 #include "pdp.h"
 #include "pdp_llconv.h"
-#include "s_stuff.h" // need to get sys_libdir for libquicktime plugins
 
 
+#if PD_MAJOR_VERSION==0 && PD_MINOR_VERSION>=43
+#include "s_stuff.h" // need to get sys_libdir for libquicktime plugins
+#endif
+
 #define min(x,y) ((x<y)?(x):(y))
 
 
diff --git a/modules/image_io/pdp_v4l.c b/modules/image_io/pdp_v4l.c
index d8d5e26..12d527c 100644
--- a/modules/image_io/pdp_v4l.c
+++ b/modules/image_io/pdp_v4l.c
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_LIBV4L1_VIDEODEV_H
 # include <libv4l1-videodev.h>
-#elif defined  HAVE_LINUX_VIDEODEV_H
+#elif 1 //defined  HAVE_LINUX_VIDEODEV_H
 # include <linux/videodev.h>
 #else
 # error cannot compile pdp_v4l without new kernel and without libv4l-dev
-- 
cgit v1.2.1