aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/generic/pdp_convert.c2
-rw-r--r--modules/generic/pdp_del.c2
-rw-r--r--modules/generic/pdp_description.c2
-rw-r--r--modules/generic/pdp_inspect.c2
-rw-r--r--modules/generic/pdp_loop.c2
-rw-r--r--modules/generic/pdp_metro.c2
-rw-r--r--modules/generic/pdp_rawin.c2
-rw-r--r--modules/generic/pdp_rawout.c2
-rw-r--r--modules/generic/pdp_reg.c2
-rw-r--r--modules/generic/pdp_route.c2
-rw-r--r--modules/generic/pdp_snap.c2
-rw-r--r--modules/generic/pdp_trigger.c2
-rw-r--r--modules/generic/pdp_udp_receive.c2
-rw-r--r--modules/generic/pdp_udp_send.c2
-rw-r--r--modules/image_basic/pdp_add.c2
-rw-r--r--modules/image_basic/pdp_bq.c2
-rw-r--r--modules/image_basic/pdp_cheby.c2
-rw-r--r--modules/image_basic/pdp_constant.c2
-rw-r--r--modules/image_basic/pdp_conv.c2
-rw-r--r--modules/image_basic/pdp_gain.c2
-rw-r--r--modules/image_basic/pdp_logic.c2
-rw-r--r--modules/image_basic/pdp_mix.c2
-rw-r--r--modules/image_basic/pdp_mul.c2
-rw-r--r--modules/image_basic/pdp_noise.c2
-rw-r--r--modules/image_basic/pdp_plasma.c2
-rw-r--r--modules/image_basic/pdp_randmix.c2
-rw-r--r--modules/image_basic/pdp_stateless.c2
-rw-r--r--modules/image_basic/pdp_zoom.c2
-rw-r--r--modules/image_io/pdp_glx.c2
-rw-r--r--modules/image_io/pdp_qt.c2
-rw-r--r--modules/image_io/pdp_sdl.c2
-rw-r--r--modules/image_io/pdp_v4l.c2
-rw-r--r--modules/image_io/pdp_xv.c2
-rw-r--r--modules/image_special/pdp_array.c100
-rw-r--r--modules/image_special/pdp_chrot.c2
-rw-r--r--modules/image_special/pdp_cog.c2
-rw-r--r--modules/image_special/pdp_grey2mask.c2
-rw-r--r--modules/image_special/pdp_histo.c2
-rw-r--r--modules/image_special/pdp_scale.c2
-rw-r--r--modules/image_special/pdp_scan.c2
-rw-r--r--modules/image_special/pdp_scanxy.c2
-rw-r--r--modules/image_special/pdp_scope.c2
-rw-r--r--modules/matrix_basic/clusterstuff.c2
-rw-r--r--modules/matrix_basic/pdp_mat_lu.c2
-rw-r--r--modules/matrix_basic/pdp_mat_mul.c2
-rw-r--r--modules/matrix_basic/pdp_mat_vec.c2
-rw-r--r--modules/test/pdp_dpd_test.c2
47 files changed, 119 insertions, 73 deletions
diff --git a/modules/generic/pdp_convert.c b/modules/generic/pdp_convert.c
index cc7dd8c..b9e298a 100644
--- a/modules/generic/pdp_convert.c
+++ b/modules/generic/pdp_convert.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_del.c b/modules/generic/pdp_del.c
index 6b7aeb2..0679c9e 100644
--- a/modules/generic/pdp_del.c
+++ b/modules/generic/pdp_del.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_description.c b/modules/generic/pdp_description.c
index 4f2ff13..38ed07f 100644
--- a/modules/generic/pdp_description.c
+++ b/modules/generic/pdp_description.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_inspect.c b/modules/generic/pdp_inspect.c
index b669475..eb1a2b9 100644
--- a/modules/generic/pdp_inspect.c
+++ b/modules/generic/pdp_inspect.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_loop.c b/modules/generic/pdp_loop.c
index 259eb8f..e6a7929 100644
--- a/modules/generic/pdp_loop.c
+++ b/modules/generic/pdp_loop.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_metro.c b/modules/generic/pdp_metro.c
index 55ad8c5..ebcc84e 100644
--- a/modules/generic/pdp_metro.c
+++ b/modules/generic/pdp_metro.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Standard sync rates.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_rawin.c b/modules/generic/pdp_rawin.c
index 04d8775..1fd28c5 100644
--- a/modules/generic/pdp_rawin.c
+++ b/modules/generic/pdp_rawin.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Raw packet input
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_rawout.c b/modules/generic/pdp_rawout.c
index 01d7ca0..e66929a 100644
--- a/modules/generic/pdp_rawout.c
+++ b/modules/generic/pdp_rawout.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Raw packet output.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_reg.c b/modules/generic/pdp_reg.c
index 2ad15a6..1d6a9d2 100644
--- a/modules/generic/pdp_reg.c
+++ b/modules/generic/pdp_reg.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_route.c b/modules/generic/pdp_route.c
index c410d1f..41e0eaf 100644
--- a/modules/generic/pdp_route.c
+++ b/modules/generic/pdp_route.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_snap.c b/modules/generic/pdp_snap.c
index 73ec26c..cd9185b 100644
--- a/modules/generic/pdp_snap.c
+++ b/modules/generic/pdp_snap.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_trigger.c b/modules/generic/pdp_trigger.c
index 597125c..36a9f3d 100644
--- a/modules/generic/pdp_trigger.c
+++ b/modules/generic/pdp_trigger.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_udp_receive.c b/modules/generic/pdp_udp_receive.c
index 3d42466..223ce69 100644
--- a/modules/generic/pdp_udp_receive.c
+++ b/modules/generic/pdp_udp_receive.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/generic/pdp_udp_send.c b/modules/generic/pdp_udp_send.c
index cb55ad1..2625d21 100644
--- a/modules/generic/pdp_udp_send.c
+++ b/modules/generic/pdp_udp_send.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_add.c b/modules/image_basic/pdp_add.c
index 0366c16..d6b94cb 100644
--- a/modules/image_basic/pdp_add.c
+++ b/modules/image_basic/pdp_add.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_bq.c b/modules/image_basic/pdp_bq.c
index 088e50b..4da4eee 100644
--- a/modules/image_basic/pdp_bq.c
+++ b/modules/image_basic/pdp_bq.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_cheby.c b/modules/image_basic/pdp_cheby.c
index 6d382ad..f4bf516 100644
--- a/modules/image_basic/pdp_cheby.c
+++ b/modules/image_basic/pdp_cheby.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_constant.c b/modules/image_basic/pdp_constant.c
index e5b088e..ffd8db1 100644
--- a/modules/image_basic/pdp_constant.c
+++ b/modules/image_basic/pdp_constant.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_conv.c b/modules/image_basic/pdp_conv.c
index dfce381..4ec942a 100644
--- a/modules/image_basic/pdp_conv.c
+++ b/modules/image_basic/pdp_conv.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_gain.c b/modules/image_basic/pdp_gain.c
index c36f758..dd58f7a 100644
--- a/modules/image_basic/pdp_gain.c
+++ b/modules/image_basic/pdp_gain.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_logic.c b/modules/image_basic/pdp_logic.c
index 002557c..78b74d6 100644
--- a/modules/image_basic/pdp_logic.c
+++ b/modules/image_basic/pdp_logic.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_mix.c b/modules/image_basic/pdp_mix.c
index 2d01d38..27c4368 100644
--- a/modules/image_basic/pdp_mix.c
+++ b/modules/image_basic/pdp_mix.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_mul.c b/modules/image_basic/pdp_mul.c
index c7321d7..c393e41 100644
--- a/modules/image_basic/pdp_mul.c
+++ b/modules/image_basic/pdp_mul.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_noise.c b/modules/image_basic/pdp_noise.c
index cb8f772..bfc2dc9 100644
--- a/modules/image_basic/pdp_noise.c
+++ b/modules/image_basic/pdp_noise.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_plasma.c b/modules/image_basic/pdp_plasma.c
index 78d886c..523f188 100644
--- a/modules/image_basic/pdp_plasma.c
+++ b/modules/image_basic/pdp_plasma.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_randmix.c b/modules/image_basic/pdp_randmix.c
index 2fd6adf..58cd583 100644
--- a/modules/image_basic/pdp_randmix.c
+++ b/modules/image_basic/pdp_randmix.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_stateless.c b/modules/image_basic/pdp_stateless.c
index cdcf313..6c264a9 100644
--- a/modules/image_basic/pdp_stateless.c
+++ b/modules/image_basic/pdp_stateless.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Some stateless image operations.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_basic/pdp_zoom.c b/modules/image_basic/pdp_zoom.c
index 48ba167..8bfcb64 100644
--- a/modules/image_basic/pdp_zoom.c
+++ b/modules/image_basic/pdp_zoom.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_io/pdp_glx.c b/modules/image_io/pdp_glx.c
index 81ec2d9..772228d 100644
--- a/modules/image_io/pdp_glx.c
+++ b/modules/image_io/pdp_glx.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_io/pdp_qt.c b/modules/image_io/pdp_qt.c
index 7c8d415..af149dc 100644
--- a/modules/image_io/pdp_qt.c
+++ b/modules/image_io/pdp_qt.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_io/pdp_sdl.c b/modules/image_io/pdp_sdl.c
index 4690230..f239d95 100644
--- a/modules/image_io/pdp_sdl.c
+++ b/modules/image_io/pdp_sdl.c
@@ -1,7 +1,7 @@
/*
* Pure Data Packet module.
* Copyright (c) 2003 by martin pi <pi@attacksyour.net>
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_io/pdp_v4l.c b/modules/image_io/pdp_v4l.c
index 7f16842..d54ee76 100644
--- a/modules/image_io/pdp_v4l.c
+++ b/modules/image_io/pdp_v4l.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_io/pdp_xv.c b/modules/image_io/pdp_xv.c
index 2faabd4..eab2e59 100644
--- a/modules/image_io/pdp_xv.c
+++ b/modules/image_io/pdp_xv.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Xvideo image packet output
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_array.c b/modules/image_special/pdp_array.c
index 41ea0d5..fdf3159 100644
--- a/modules/image_special/pdp_array.c
+++ b/modules/image_special/pdp_array.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) 2003 by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) 2003 by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,18 +29,76 @@ typedef struct _pdp_array
{
t_object x_obj;
t_symbol *x_array_sym;
- t_outlet *x_outlet; // for array->pdp
- t_int x_rows;
+ t_outlet *x_outlet0; // for array->pdp
+ t_int x_rows; // transposed
+
+ /* packet creation */
+ t_int x_width;
+ t_int x_height;
+
+ /* only valid after "get array" */
+ float *x_vec;
+ int x_nbpoints;
+
+
/* the packet */
int x_packet0;
} t_pdp_array;
+static void get_array(t_pdp_array *x){
+ t_garray *a;
+
+ x->x_vec = 0;
+
+ /* dump to array if possible */
+ if (!x->x_array_sym) return;
+
+ /* check if array is valid */
+ if (!(a = (t_garray *)pd_findbyclass(x->x_array_sym, garray_class))){
+ post("pdp_array: %s: no such array", x->x_array_sym->s_name);
+ return;
+ }
+
+ /* get data */
+ if (!garray_getfloatarray(a, &x->x_nbpoints, &x->x_vec)){
+ post("pdp_array: %s: bad template", x->x_array_sym->s_name);
+ return;
+ }
+}
+
static void pdp_array_bang(t_pdp_array *x)
{
- post("not implemented");
+ PDP_ASSERT(-1 == x->x_packet0);
+ x->x_packet0 = pdp_packet_new_image_grey(x->x_width, x->x_height);
+ if (-1 != x->x_packet0){
+ t_pdp *header = pdp_packet_header(x->x_packet0);
+ short int *data = (short int*)pdp_packet_data(x->x_packet0);
+ get_array(x);
+ if (x->x_vec){
+ int i;
+ int w = header->info.image.width;
+ int h = header->info.image.height;
+ int N = w*h;
+ N = (x->x_nbpoints < N) ? x->x_nbpoints : N;
+
+ /* scan rows */
+ if (1 || x->x_rows){
+ // FIXME: saturation
+ for (i=0; i<N; i++) {
+ float max = (float)0x8000;
+ float f = x->x_vec[i] * max;
+ int l = (int)f;
+ l = (l > 0x8000) ? 0x7fff : l;
+ l = (l < -0x8000) ? -0x8000 : l;
+ data[i] = (short int)l;
+ }
+ }
+ }
+ pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet0);
+ }
}
@@ -58,49 +116,34 @@ static void pdp_array_input_0(t_pdp_array *x, t_symbol *s, t_floatarg f)
/* process */
if (s == gensym("process")){
- float *vec;
- int nbpoints;
t_garray *a;
t_pdp *header = pdp_packet_header(x->x_packet0);
short int *data = pdp_packet_data(x->x_packet0);
if (!header || !data) return;
- /* dump to array if possible */
- if (!x->x_array_sym){
- }
-
- /* check if array is valid */
- else if (!(a = (t_garray *)pd_findbyclass(x->x_array_sym, garray_class))){
- post("pdp_array: %s: no such array", x->x_array_sym->s_name);
- }
- /* get data */
- else if (!garray_getfloatarray(a, &nbpoints, &vec)){
- post("pdp_array: %s: bad template", x->x_array_sym->s_name);
- }
- /* scale and dump in array */
- else{
+
+ get_array(x);
+ if (x->x_vec){
int i;
int w = header->info.image.width;
int h = header->info.image.height;
int N = w*h;
- N = (nbpoints < N) ? nbpoints : N;
+ N = (x->x_nbpoints < N) ? x->x_nbpoints : N;
/* scan rows */
if (x->x_rows){
for (i=0; i<N; i++)
- vec[i] = (float)data[i] * (1.0f / (float)0x8000);
+ x->x_vec[i] = (float)data[i] * (1.0f / (float)0x8000);
}
/* scan columns */
else{
for (i=0; i<N; i++) {
- int x = i / h;
- int y = i % h;
- vec[i] = (float)data[x+(h-y-1)*w] * (1.0f / (float)0x8000);
+ int xx = i / h;
+ int yy = i % h;
+ x->x_vec[i] = (float)data[xx+(h-yy-1)*w] * (1.0f / (float)0x8000);
}
}
- //garray_redraw(a);
}
-
}
}
@@ -127,6 +170,9 @@ void *pdp_array2grey_new(t_symbol *s, t_symbol *r)
{
t_pdp_array *x = (t_pdp_array *)pd_new(pdp_array2grey_class);
pdp_array_array(x, s);
+ x->x_outlet0 = outlet_new(&x->x_obj, &s_anything);
+ x->x_width = 320;
+ x->x_height = 240;
return (void *)x;
}
diff --git a/modules/image_special/pdp_chrot.c b/modules/image_special/pdp_chrot.c
index 27993c6..f99a9c1 100644
--- a/modules/image_special/pdp_chrot.c
+++ b/modules/image_special/pdp_chrot.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_cog.c b/modules/image_special/pdp_cog.c
index c1ea1bf..24eb0f0 100644
--- a/modules/image_special/pdp_cog.c
+++ b/modules/image_special/pdp_cog.c
@@ -1,7 +1,7 @@
/*
* Pure Data Packet module.
* Copyright (c) 2003 by Johannes Taelman <johannes.taelman@rug.ac.be>
- * API updates by Tom Schouten <pdp@zzz.kotnet.org>
+ * API updates by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_grey2mask.c b/modules/image_special/pdp_grey2mask.c
index 4f10772..f68d63e 100644
--- a/modules/image_special/pdp_grey2mask.c
+++ b/modules/image_special/pdp_grey2mask.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_histo.c b/modules/image_special/pdp_histo.c
index 43cdb8c..22e817a 100644
--- a/modules/image_special/pdp_histo.c
+++ b/modules/image_special/pdp_histo.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) 2003 by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) 2003 by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_scale.c b/modules/image_special/pdp_scale.c
index 3c74bd8..5b94f1a 100644
--- a/modules/image_special/pdp_scale.c
+++ b/modules/image_special/pdp_scale.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_scan.c b/modules/image_special/pdp_scan.c
index 9b80fea..482a966 100644
--- a/modules/image_special/pdp_scan.c
+++ b/modules/image_special/pdp_scan.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_scanxy.c b/modules/image_special/pdp_scanxy.c
index 6fd7201..fe6efb9 100644
--- a/modules/image_special/pdp_scanxy.c
+++ b/modules/image_special/pdp_scanxy.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/image_special/pdp_scope.c b/modules/image_special/pdp_scope.c
index 4311a0b..a1d28cc 100644
--- a/modules/image_special/pdp_scope.c
+++ b/modules/image_special/pdp_scope.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/matrix_basic/clusterstuff.c b/modules/matrix_basic/clusterstuff.c
index 432a807..e6005dd 100644
--- a/modules/matrix_basic/clusterstuff.c
+++ b/modules/matrix_basic/clusterstuff.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) 2003 by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) 2003 by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/matrix_basic/pdp_mat_lu.c b/modules/matrix_basic/pdp_mat_lu.c
index af8931d..7b4f29e 100644
--- a/modules/matrix_basic/pdp_mat_lu.c
+++ b/modules/matrix_basic/pdp_mat_lu.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. LU decomposition module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/matrix_basic/pdp_mat_mul.c b/modules/matrix_basic/pdp_mat_mul.c
index 329813f..4fd9d07 100644
--- a/modules/matrix_basic/pdp_mat_mul.c
+++ b/modules/matrix_basic/pdp_mat_mul.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Matrix multiplication module
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/matrix_basic/pdp_mat_vec.c b/modules/matrix_basic/pdp_mat_vec.c
index 16257c8..2a3b3bb 100644
--- a/modules/matrix_basic/pdp_mat_vec.c
+++ b/modules/matrix_basic/pdp_mat_vec.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module. Vector modules.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/test/pdp_dpd_test.c b/modules/test/pdp_dpd_test.c
index 1d85bde..f4c5e5a 100644
--- a/modules/test/pdp_dpd_test.c
+++ b/modules/test/pdp_dpd_test.c
@@ -1,6 +1,6 @@
/*
* Pure Data Packet module.
- * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ * Copyright (c) by Tom Schouten <tom@zwizwa.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by