aboutsummaryrefslogtreecommitdiff
path: root/modules/pdp_canvas.c
diff options
context:
space:
mode:
Diffstat (limited to 'modules/pdp_canvas.c')
-rw-r--r--modules/pdp_canvas.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/modules/pdp_canvas.c b/modules/pdp_canvas.c
index 587811e..762428a 100644
--- a/modules/pdp_canvas.c
+++ b/modules/pdp_canvas.c
@@ -37,40 +37,40 @@ typedef struct pdp_canvas_struct
t_float x_f;
t_outlet *x_outlet0;
- t_int x_dropped;
- t_int x_queue_id;
+ int x_dropped;
+ int x_queue_id;
- t_int x_opacket;
- t_int x_lastpacket;
+ int x_opacket;
+ int x_lastpacket;
- t_int x_current;
+ int x_current;
t_float x_xmouse;
t_float x_ymouse;
- t_int *x_packets;
- t_int *x_widths;
- t_int *x_heights;
+ int *x_packets;
+ int *x_widths;
+ int *x_heights;
t_float *x_xoffsets;
t_float *x_yoffsets;
- t_int *x_sizes;
+ int *x_sizes;
- t_int x_owidth;
- t_int x_oheight;
- t_int x_osize;
- t_int x_nbinputs;
+ int x_owidth;
+ int x_oheight;
+ int x_osize;
+ int x_nbinputs;
} t_pdp_canvas;
static void pdp_canvas_process_yv12(t_pdp_canvas *x)
{
- t_int px, py, ppx, ppy, ii, nbs;
+ int px, py, ppx, ppy, ii, nbs;
short int *pY, *pU, *pV;
short int *ppY, *ppU, *ppV;
t_pdp *oheader;
short int *odata, *pdata;
t_pdp *iheader;
short int *idata;
- t_int mx, dx, my, dy;
+ int mx, dx, my, dy;
x->x_opacket = pdp_packet_new_image_YCrCb( x->x_owidth, x->x_oheight );
oheader = pdp_packet_header(x->x_opacket);
@@ -133,12 +133,12 @@ static void pdp_canvas_process_yv12(t_pdp_canvas *x)
for ( py=x->x_yoffsets[ii]+my; py<x->x_yoffsets[ii]+dy; py++)
{
- memcpy( pY+(py*x->x_owidth)+(t_int)x->x_xoffsets[ii]+mx,
- ppY+(py-(t_int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx*sizeof(short int) );
- memcpy( pU+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1),
- ppU+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx );
- memcpy( pV+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1),
- ppV+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx );
+ memcpy( pY+(py*x->x_owidth)+(int)x->x_xoffsets[ii]+mx,
+ ppY+(py-(int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx*sizeof(short int) );
+ memcpy( pU+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1),
+ ppU+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx );
+ memcpy( pV+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1),
+ ppV+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx );
}
}
@@ -153,7 +153,7 @@ static void pdp_canvas_sendpacket(t_pdp_canvas *x)
pdp_packet_pass_if_valid(x->x_outlet0, &x->x_opacket);
}
-static void pdp_canvas_process(t_pdp_canvas *x, t_int ni)
+static void pdp_canvas_process(t_pdp_canvas *x, int ni)
{
int encoding;
t_pdp *header = 0;
@@ -193,7 +193,7 @@ static void pdp_canvas_offset(t_pdp_canvas *x, t_floatarg ni, t_floatarg xoffset
static void pdp_canvas_select(t_pdp_canvas *x, t_floatarg X, t_floatarg Y)
{
- t_int ii;
+ int ii;
x->x_current = -1;
X = X*x->x_owidth;
@@ -234,7 +234,7 @@ static void pdp_canvas_unselect(t_pdp_canvas *x)
x->x_current = -1;
}
-static void pdp_canvas_input(t_pdp_canvas *x, t_symbol *s, t_floatarg f, t_int ni)
+static void pdp_canvas_input(t_pdp_canvas *x, t_symbol *s, t_floatarg f, int ni)
{
t_pdp *header;
short int *data;
@@ -318,7 +318,7 @@ static void pdp_canvas_input9(t_pdp_canvas *x, t_symbol *s, t_floatarg f)
static void pdp_canvas_free(t_pdp_canvas *x)
{
- t_int ii;
+ int ii;
pdp_queue_finish(x->x_queue_id);
for ( ii=0; ii<x->x_nbinputs; ii++)
@@ -326,10 +326,10 @@ static void pdp_canvas_free(t_pdp_canvas *x)
pdp_packet_mark_unused(x->x_packets[ii]);
}
pdp_packet_mark_unused(x->x_opacket);
- if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(t_int) );
- if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(t_int) );
- if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(t_int) );
- if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(t_int) );
+ if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(int) );
+ if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(int) );
+ if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(int) );
+ if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(int) );
if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) );
if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) );
}
@@ -339,7 +339,7 @@ t_class *pdp_canvas_class;
void *pdp_canvas_new(t_symbol *s, int argc, t_atom *argv)
{
t_pdp_canvas *x = (t_pdp_canvas *)pd_new(pdp_canvas_class);
- t_int ii;
+ int ii;
char *imes[32];
if ( argc != 3 )
@@ -383,10 +383,10 @@ void *pdp_canvas_new(t_symbol *s, int argc, t_atom *argv)
post ( "pdp_canvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs );
- x->x_packets = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) );
- x->x_widths = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) );
- x->x_heights = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) );
- x->x_sizes = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) );
+ x->x_packets = ( int* ) getbytes( x->x_nbinputs*sizeof(int) );
+ x->x_widths = ( int* ) getbytes( x->x_nbinputs*sizeof(int) );
+ x->x_heights = ( int* ) getbytes( x->x_nbinputs*sizeof(int) );
+ x->x_sizes = ( int* ) getbytes( x->x_nbinputs*sizeof(int) );
x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) );
x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) );