From a587a74821c155e281d2a6ce9a9a1d7b6a336fce Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 24 May 2008 23:14:15 +0000 Subject: Checked in latest from Tom Schouten's darcs repository, which was checked in 19-Feb-2008. Changes are mostly the email address and URLs, but two new objects are also added: pdp_array2grey and pdp_grey2array for converting between Pd arrays and greyscale images. svn path=/trunk/externals/pdp/; revision=9899 --- modules/image_special/pdp_array.c | 100 +++++++++++++++++++++++++--------- modules/image_special/pdp_chrot.c | 2 +- modules/image_special/pdp_cog.c | 2 +- modules/image_special/pdp_grey2mask.c | 2 +- modules/image_special/pdp_histo.c | 2 +- modules/image_special/pdp_scale.c | 2 +- modules/image_special/pdp_scan.c | 2 +- modules/image_special/pdp_scanxy.c | 2 +- modules/image_special/pdp_scope.c | 2 +- 9 files changed, 81 insertions(+), 35 deletions(-) (limited to 'modules/image_special') 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 + * Copyright (c) 2003 by Tom Schouten * * 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; ix_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; ix_vec[i] = (float)data[i] * (1.0f / (float)0x8000); } /* scan columns */ else{ for (i=0; ix_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 + * Copyright (c) by Tom Schouten * * 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 - * API updates by Tom Schouten + * API updates by Tom Schouten * * 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 + * Copyright (c) by Tom Schouten * * 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 + * Copyright (c) 2003 by Tom Schouten * * 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 + * Copyright (c) by Tom Schouten * * 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 + * Copyright (c) by Tom Schouten * * 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 + * Copyright (c) by Tom Schouten * * 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 + * Copyright (c) by Tom Schouten * * 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 -- cgit v1.2.1