pdp: merge with zwizwa darcs

svn path=/trunk/externals/pdp/; revision=15799

10 files changed, 33 insertions, 33 deletions

diff --git a/README b/README
index a9251ab..986249c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-PDP - Pure Data Packet v0.12.6
+PDP - Pure Data Packet v0.12.4
 a packet processing library for pure data
 
 Copyright (c) by Tom Schouten <tom@zwizwa.be>
diff --git a/include/pdp_types.h b/include/pdp_types.h
index 3842a66..5b4bbfc 100644
--- a/include/pdp_types.h
+++ b/include/pdp_types.h
@@ -48,6 +48,9 @@ typedef unsigned short     u16;
 typedef unsigned int       u32;
 typedef unsigned long long u64;
 
+typedef unsigned long      uptr;  /* An unsigned int the size of a pointer. */
+typedef signed   long      sptr;
+
 typedef struct _pdp t_pdp;
 typedef void (*t_pdp_packet_method1)(t_pdp *);              /* dst */
 typedef void (*t_pdp_packet_method2)(t_pdp *, t_pdp *);     /* dst, src */
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
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;
 
diff --git a/www/index.html b/www/index.html
index a0d84cc..b4444de 100644
--- a/www/index.html
+++ b/www/index.html
@@ -17,14 +17,6 @@ functionality, have a look at Yves
 Degoyon's <a href="http://ydegoyon.free.fr/pidip.html">PiDiP</a>
 library.
 
-<p> PDP is currently in maintenance only mode.  After version 0.12 I
-  got ambitious and started writing 
-<a href="http://zwizwa.be/packetforth">Packet Forth (PF)</a>
-and <a href="http://zwizwa.be/staapl">Staapl</a>.  These projects
-address problems in the design of PDP, but are not in a state to be
-included back into PDP.  However, Packet Forth can be used as a
-Pure Data external.
-
 <p> For documentation, have a look at the 'pdp' subdirectory in pd's 'Pure
 Documentation'.  Most objects are documented with pd style help
 patches accessible by right clicking on an object. The place to send
@@ -33,29 +25,31 @@ questions is the Pure Data mailing list.
 <a name="darcs">
 <h2>Download</h2></a>
 
-The latest stable PDP tarball release
-is <a href="http://zwizwa.be/pd/pdp/pdp-0.12.5.tar.gz">0.12.5</a>.
-For older releases see <a href="http://zwizwa.be/pd/pdp">here</a>.
-During this maintenance only phase, the main distribution and code
-contribution channel is the Pure Data SVN.  I do try to keep
-my <a href="http://zwizwa.be/darcs/pdp-12">darcs</a> archive up to
-date.  
-PDP is written by Tom Schouten and released under the GPL v2.
+The latest stable PDP tarball release can be found in the
+<a href="http://sourceforge.net/projects/pure-data/files/libraries/pdp/">PDP</a>
+section of the Pure
+Data <a href="http://sourceforge.net/projects/pure-data"> SourceForge
+project</a>.  The <code>pd-pdp</code> package is currently maintained
+by Paul Brossier.  PDP is written by <a href="http://zwizwa.be">Tom
+Schouten</a> and released under the GPL v2.
+
 
 <a name="links">
 <h2>Links</h2></a>
 
-<li><a href="http://pure-data.iem.at/about/">Pure Data at IEM</a>
+<li><a href="http://pure-data.info/">Pure Data portal</a>
 <li><a href="http://ydegoyon.free.fr/pidip.html">PiDiP Is Definitely In Pieces</a>
 <li><a href="http://www.hackitectura.net/aljwarizmi/">al-Jwarizmi</a>
-<li><a href="http://www.artefacte.org/modules.php?op=modload&name=PD&file=index">PidipVJ</a>
 <li><a href="http://rama.xicnet.com/appz.php">Videoflow / Cruzados BGN</a>
 <li><a href="http://attacksyour.net/pi/pd/index.html">Eth0</a>
 <li><a href="http://footils.org/cms">RRADical</a>
 
-<li><a href="http://veejay.sourceforge.net/">Veejay</a> / <a href="http://zwizwa.fartit.com/pd/sendVIMS/">SendVIMS</a>
+<li><a href="http://veejay.sourceforge.net/">Veejay</a> / <a href="http://zwizwa.be/pd/sendVIMS/">SendVIMS</a>
 <li><a href="http://freej.dyne.org/">FreeJ</a>
 <li><a href="http://effectv.sourceforge.net/">EffecTV</a>
+<li><a href="http://zwizwa.be/packetforth/">Packet Forth</a>, the
+direct descendant of PDP.
+<li><a href="http://zwizwa.be/-/libprim/">libprim</a>, a descendant of Packet Forth.