From: <and...@us...> - 2009-09-24 19:38:33
|
Revision: 10473 http://plplot.svn.sourceforge.net/plplot/?rev=10473&view=rev Author: andrewross Date: 2009-09-24 19:38:19 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Update indenting of function prototypes and definitions to align on brackets. Modified Paths: -------------- trunk/src/plargs.c trunk/src/plbox.c trunk/src/plcont.c trunk/src/plcore.c trunk/src/plctrl.c trunk/src/pldeprecated.c trunk/src/pldtik.c trunk/src/plfill.c trunk/src/plfreetype.c trunk/src/plgridd.c trunk/src/plhist.c trunk/src/plimage.c trunk/src/plline.c trunk/src/plmap.c trunk/src/plot3d.c trunk/src/plshade.c trunk/src/plstripc.c trunk/src/plsym.c trunk/src/plvect.c trunk/src/plvpor.c trunk/src/plwind.c Modified: trunk/src/plargs.c =================================================================== --- trunk/src/plargs.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plargs.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -940,7 +940,7 @@ static int ParseOpt( int *p_myargc, const char ***p_argv, int *p_argc, const char ***p_argsave, - PLOptionTable *option_table ) + PLOptionTable *option_table ) { PLOptionTable *tab; const char *opt; @@ -992,7 +992,7 @@ static int ProcessOpt( const char *opt, PLOptionTable *tab, int *p_myargc, const char ***p_argv, - int *p_argc ) + int *p_argc ) { int need_arg, res; const char *optarg = NULL; Modified: trunk/src/plbox.c =================================================================== --- trunk/src/plbox.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plbox.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -38,28 +38,28 @@ static void plxybx( const char *opt, const char *label, PLINT axis, PLFLT wx1, PLFLT wy1, - PLFLT wx2, PLFLT wy2, PLFLT vmin, PLFLT vmax, - PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ); + PLFLT wx2, PLFLT wy2, PLFLT vmin, PLFLT vmax, + PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ); static void plzbx( const char *opt, const char *label, PLINT right, PLFLT dx, PLFLT dy, - PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin, PLFLT vmax, - PLFLT tick, PLINT nsub, PLINT *digits ); + PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin, PLFLT vmax, + PLFLT tick, PLINT nsub, PLINT *digits ); static void plxytx( PLFLT wx1, PLFLT wy1, PLFLT wx2, PLFLT wy2, - PLFLT disp, PLFLT pos, PLFLT just, const char *text ); + PLFLT disp, PLFLT pos, PLFLT just, const char *text ); static void plztx( const char *opt, PLFLT dx, PLFLT dy, PLFLT wx, PLFLT wy1, - PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ); + PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ); static void plform( PLINT axis, PLFLT value, PLINT scale, PLINT prec, char *result, PLINT len, PLBOOL ll, PLBOOL lf, PLBOOL lo ); static void grid_box( const char *xopt, PLFLT xtick1, PLINT nxsub1, - const char *yopt, PLFLT ytick1, PLINT nysub1 ); + const char *yopt, PLFLT ytick1, PLINT nysub1 ); static void label_box( const char *xopt, PLFLT xtick1, const char *yopt, PLFLT ytick1 ); @@ -76,7 +76,7 @@ void c_plbox( const char *xopt, PLFLT xtick, PLINT nxsub, - const char *yopt, PLFLT ytick, PLINT nysub ) + const char *yopt, PLFLT ytick, PLINT nysub ) { c_plaxes( 0.0, 0.0, xopt, xtick, nxsub, yopt, ytick, nysub ); } @@ -116,8 +116,8 @@ void c_plaxes( PLFLT x0, PLFLT y0, - const char *xopt, PLFLT xtick, PLINT nxsub, - const char *yopt, PLFLT ytick, PLINT nysub ) + const char *xopt, PLFLT xtick, PLINT nxsub, + const char *yopt, PLFLT ytick, PLINT nysub ) { PLBOOL lax, lbx, lcx, ldx, lgx, lix, llx, lsx, ltx; PLBOOL lay, lby, lcy, ldy, lgy, liy, lly, lsy, lty; @@ -531,8 +531,8 @@ void c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nsubx, - const char *yopt, const char *ylabel, PLFLT ytick, PLINT nsuby, - const char *zopt, const char *zlabel, PLFLT ztick, PLINT nsubz ) + const char *yopt, const char *ylabel, PLFLT ytick, PLINT nsuby, + const char *zopt, const char *zlabel, PLFLT ztick, PLINT nsubz ) { PLFLT dx, dy, tx, ty, ux, uy; PLFLT xmin, xmax, ymin, ymax, zmin, zmax, zscale; @@ -721,8 +721,8 @@ static void plxybx( const char *opt, const char *label, PLINT axis, PLFLT wx1, PLFLT wy1, - PLFLT wx2, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, - PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ) + PLFLT wx2, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, + PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ) { static char string[STRING_LEN]; PLINT lb, ld, lf, li, ll, ln, ls, lt, lu, lo; @@ -881,7 +881,7 @@ static void plxytx( PLFLT wx1, PLFLT wy1, PLFLT wx2, PLFLT wy2, - PLFLT disp, PLFLT pos, PLFLT just, const char *text ) + PLFLT disp, PLFLT pos, PLFLT just, const char *text ) { PLINT x, y, refx, refy; PLFLT shift, cc, ss, wx, wy; @@ -949,8 +949,8 @@ static void plzbx( const char *opt, const char *label, PLINT right, PLFLT dx, PLFLT dy, - PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, - PLFLT tick, PLINT nsub, PLINT *digits ) + PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, + PLFLT tick, PLINT nsub, PLINT *digits ) { static char string[STRING_LEN]; PLINT lb, lc, ld, lf, li, ll, lm, ln, ls, lt, lu, lv, lo; @@ -1127,7 +1127,7 @@ static void plztx( const char *opt, PLFLT dx, PLFLT dy, PLFLT wx, PLFLT wy1, - PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ) + PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ) { PLINT refx = 0, refy = 0, x = 0, y = 0, vert = 0; PLFLT shift, cc, ss, wy; @@ -1196,7 +1196,7 @@ static void grid_box( const char *xopt, PLFLT xtick1, PLINT nxsub1, - const char *yopt, PLFLT ytick1, PLINT nysub1 ) + const char *yopt, PLFLT ytick1, PLINT nysub1 ) { PLINT lgx, lhx, llx; PLINT lgy, lhy, lly; Modified: trunk/src/plcont.c =================================================================== --- trunk/src/plcont.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plcont.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -34,21 +34,21 @@ static void plcntr( PLFLT ( *plf2eval )( PLINT, PLINT, PLPointer ), - PLPointer plf2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ); + PLPointer plf2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ); static void pldrawcn( PLFLT ( *plf2eval )( PLINT, PLINT, PLPointer ), - PLPointer plf2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, - PLFLT lastx, PLFLT lasty, PLINT startedge, - PLINT **ipts, PLFLT *distance, PLINT *lastindex, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ); + PLPointer plf2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, + PLFLT lastx, PLFLT lasty, PLINT startedge, + PLINT **ipts, PLFLT *distance, PLINT *lastindex, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ); static void plfloatlabel( PLFLT value, char *string, PLINT len ); @@ -474,10 +474,10 @@ void cont_store( PLFLT **f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data, - CONT_LEVEL **contour ) + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data, + CONT_LEVEL **contour ) { cont3d = 1; @@ -497,9 +497,9 @@ void c_plcont( PLFLT **f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLfGrid2 grid; @@ -535,11 +535,11 @@ void plfcont( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT i, **ipts; @@ -597,11 +597,11 @@ static void plcntr( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT kcol, krow, lastindex; PLFLT distance; @@ -655,13 +655,13 @@ static void pldrawcn( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, - PLFLT lastx, PLFLT lasty, PLINT startedge, PLINT **ipts, - PLFLT *distance, PLINT *lastindex, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, + PLFLT lastx, PLFLT lasty, PLINT startedge, PLINT **ipts, + PLFLT *distance, PLINT *lastindex, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLFLT f[4]; PLFLT px[4], py[4], locx[4], locy[4]; Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plcore.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -553,7 +553,7 @@ void plP_text( PLINT base, PLFLT just, PLFLT *xform, PLINT x, PLINT y, - PLINT refx, PLINT refy, const char *string ) + PLINT refx, PLINT refy, const char *string ) { if ( plsc->dev_text ) /* Does the device render it's own text ? */ { @@ -588,8 +588,8 @@ { len = strlen( string ); /* this length is only used in the loop - * counter, we will work out the length of - * the unicode string as we go */ + * counter, we will work out the length of + * the unicode string as we go */ plgesc( &esc ); /* At this stage we will do some translations into unicode, like @@ -610,7 +610,7 @@ plP_esc( PLESC_BEGIN_TEXT, &args ); } for ( j = i = 0; i < len; i++ ) /* Walk through the string, and convert - * some stuff to unicode on the fly */ + * some stuff to unicode on the fly */ { skip = 0; @@ -818,7 +818,7 @@ (PLUNICODE) hershey_to_unicode_lookup_table[idx].Unicode; i += 2; skip = 1; /* skip is set if we have copied something - * into the unicode table */ + * into the unicode table */ if ( plsc->alt_unicode ) { @@ -834,7 +834,7 @@ unicode_buffer[j++] = (PLUNICODE) 0x00; i += 2; skip = 1; /* skip is set if we have copied something - * into the unicode table */ + * into the unicode table */ if ( plsc->alt_unicode ) { @@ -920,11 +920,11 @@ if ( j > 0 ) { args.unicode_array_len = j; /* Much easier to set the length than - * work it out later :-) */ + * work it out later :-) */ args.unicode_array = &unicode_buffer[0]; /* Get address of the - * unicode buffer (even - * though it is - * currently static) */ + * unicode buffer (even + * though it is + * currently static) */ } else /* Don't print anything, if there is no unicode to print! */ @@ -1136,7 +1136,7 @@ void difilt( PLINT *xscl, PLINT *yscl, PLINT npts, - PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) + PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) { PLINT i, x, y; @@ -1201,7 +1201,7 @@ void sdifilt( short *xscl, short *yscl, PLINT npts, - PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) + PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) { int i; short x, y; @@ -1794,7 +1794,7 @@ void c_plsdimap( PLINT dimxmin, PLINT dimxmax, PLINT dimymin, PLINT dimymax, - PLFLT dimxpmm, PLFLT dimypmm ) + PLFLT dimxpmm, PLFLT dimypmm ) { plsetvar( plsc->dimxmin, dimxmin ); plsetvar( plsc->dimxmax, dimxmax ); @@ -3079,7 +3079,7 @@ void c_plgpage( PLFLT *p_xp, PLFLT *p_yp, - PLINT *p_xleng, PLINT *p_yleng, PLINT *p_xoff, PLINT *p_yoff ) + PLINT *p_xleng, PLINT *p_yleng, PLINT *p_xoff, PLINT *p_yoff ) { *p_xp = plsc->xdpi; *p_yp = plsc->ydpi; @@ -3203,7 +3203,7 @@ void plsKeyEH( void ( *KeyEH )( PLGraphicsIn *, void *, int * ), - void *KeyEH_data ) + void *KeyEH_data ) { plsc->KeyEH = KeyEH; plsc->KeyEH_data = KeyEH_data; @@ -3213,7 +3213,7 @@ void plsButtonEH( void ( *ButtonEH )( PLGraphicsIn *, void *, int * ), - void *ButtonEH_data ) + void *ButtonEH_data ) { plsc->ButtonEH = ButtonEH; plsc->ButtonEH_data = ButtonEH_data; @@ -3810,7 +3810,7 @@ PLINT ret = 0; /* set up return code to 0, the value if no devices match*/ buff = (char *) malloc((size_t) PL_NSTREAMS * 8 ); /* Allocate enough memory for 8 - * characters for each possible stream */ + * characters for each possible stream */ if ( buff != NULL ) { @@ -3847,7 +3847,7 @@ void plP_image( PLFLT *z, PLINT nx, PLINT ny, PLFLT xmin, PLFLT ymin, PLFLT dx, PLFLT dy, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), PLPointer pltr_data ) + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), PLPointer pltr_data ) { plsc->page_status = DRAWING; Modified: trunk/src/plctrl.c =================================================================== --- trunk/src/plctrl.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plctrl.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -88,7 +88,7 @@ static void cmap0_palette_read( const char *filename, - int *number_colors, int **r, int **g, int **b, double **a ); + int *number_colors, int **r, int **g, int **b, double **a ); /* An additional hardwired location for lib files. */ /* I have no plans to change these again, ever. */ @@ -568,7 +568,7 @@ void c_plscmap1l( PLINT itype, PLINT npts, PLFLT *pos, - PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLINT *rev ) + PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLINT *rev ) { int n; PLFLT h, l, s, r, g, b; @@ -642,7 +642,7 @@ void c_plscmap1la( PLINT itype, PLINT npts, PLFLT *pos, - PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a, PLINT *rev ) + PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a, PLINT *rev ) { int n; PLFLT h, l, s, r, g, b; @@ -1241,7 +1241,7 @@ void cmap0_palette_read( const char *filename, - int *number_colors, int **r, int **g, int **b, double **a ) + int *number_colors, int **r, int **g, int **b, double **a ) { int i, err = 0; char color_info[30]; @@ -2453,7 +2453,7 @@ void plRotPhy( PLINT orient, PLINT xmin, PLINT ymin, PLINT xmax, PLINT ymax, - PLINT *px, PLINT *py ) + PLINT *px, PLINT *py ) { int x, y; Modified: trunk/src/pldeprecated.c =================================================================== --- trunk/src/pldeprecated.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/pldeprecated.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -90,7 +90,7 @@ void plarrows( PLFLT *u, PLFLT *v, PLFLT *x, PLFLT *y, PLINT n, - PLFLT scale, PLFLT dx, PLFLT dy ) + PLFLT scale, PLFLT dx, PLFLT dy ) { PLFLT uu, vv; PLINT i, j, npts = 4; Modified: trunk/src/pldtik.c =================================================================== --- trunk/src/pldtik.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/pldtik.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -252,7 +252,7 @@ void pldprec( PLFLT vmin, PLFLT vmax, PLFLT tick, PLINT lf, - PLINT *mode, PLINT *prec, PLINT digmax, PLINT *scale ) + PLINT *mode, PLINT *prec, PLINT digmax, PLINT *scale ) { PLFLT chosen, notchosen, vmod, t0; PLINT msd, notmsd, np, digmin, digfix; Modified: trunk/src/plfill.c =================================================================== --- trunk/src/plfill.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plfill.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -289,7 +289,7 @@ static void buildlist( PLINT xp1, PLINT yp1, PLINT xp2, PLINT yp2, PLINT xp3, PLINT yp3, - PLINT dinc ) + PLINT dinc ) { PLINT min_y, max_y; PLINT dx, dy, cstep, nstep, ploty, plotx; Modified: trunk/src/plfreetype.c =================================================================== --- trunk/src/plfreetype.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plfreetype.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -382,7 +382,7 @@ FT_Load_Char( FT->face, text[i], ( FT->smooth_text == 0 ) ? FT_LOAD_MONOCHROME + FT_LOAD_RENDER : FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT ); FT_PlotChar( pls, FT, FT->face->glyph, - ROUND( x / 64.0 ), ROUND( y / 64.0 ), 2 ); /* render the text */ + ROUND( x / 64.0 ), ROUND( y / 64.0 ), 2 ); /* render the text */ x += FT->face->glyph->advance.x; y -= FT->face->glyph->advance.y; @@ -401,7 +401,7 @@ void FT_PlotChar( PLStream *pls, FT_Data *FT, FT_GlyphSlot slot, - int x, int y, short colour ) + int x, int y, short colour ) { unsigned char bittest; short i, k, j; Modified: trunk/src/plgridd.c =================================================================== --- trunk/src/plgridd.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plgridd.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -38,33 +38,33 @@ /* forward declarations */ static void grid_nnaidw( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); static void grid_nnli( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - PLFLT threshold ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + PLFLT threshold ); static void grid_nnidw( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - int knn_order ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + int knn_order ); #ifdef WITH_CSA static void grid_csa( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); #endif #ifdef HAVE_QHULL static void grid_nni( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - PLFLT wmin ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + PLFLT wmin ); static void grid_dtli( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ); #endif static void @@ -109,8 +109,8 @@ void c_plgriddata( PLFLT *x, PLFLT *y, PLFLT *z, PLINT npts, - PLFLT *xg, PLINT nptsx, PLFLT *yg, PLINT nptsy, - PLFLT **zg, PLINT type, PLFLT data ) + PLFLT *xg, PLINT nptsx, PLFLT *yg, PLINT nptsy, + PLFLT **zg, PLINT type, PLFLT data ) { int i, j; @@ -199,7 +199,7 @@ static void grid_csa( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) { PLFLT *xt, *yt, *zt; point *pin, *pgrid, *pt; @@ -269,8 +269,8 @@ static void grid_nnidw( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - int knn_order ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + int knn_order ) { int i, j, k; PLFLT wi, nt; @@ -332,8 +332,8 @@ static void grid_nnli( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - PLFLT threshold ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + PLFLT threshold ) { PLFLT xx[4], yy[4], zz[4], t, A, B, C, D, d1, d2, d3, max_thick; int i, j, ii, excl, cnt, excl_item; @@ -510,7 +510,7 @@ static void grid_nnaidw( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) { PLFLT d, nt; int i, j, k; @@ -553,7 +553,7 @@ static void grid_dtli( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) { point *pin, *pgrid, *pt; PLFLT *xt, *yt, *zt; @@ -622,8 +622,8 @@ static void grid_nni( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, - PLFLT wmin ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg, + PLFLT wmin ) { PLFLT *xt, *yt, *zt; point *pin, *pgrid, *pt; @@ -787,7 +787,7 @@ #ifdef NONN /* another DTLI, based only on QHULL, not nn */ static void grid_adtli( PLFLT *x, PLFLT *y, PLFLT *z, int npts, - PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) + PLFLT *xg, int nptsx, PLFLT *yg, int nptsy, PLFLT **zg ) { coordT *points; /* array of coordinates for each point */ boolT ismalloc = False; /* True if qhull should free points */ Modified: trunk/src/plhist.c =================================================================== --- trunk/src/plhist.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plhist.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -41,7 +41,7 @@ void c_plhist( PLINT n, PLFLT *data, PLFLT datmin, PLFLT datmax, - PLINT nbin, PLINT flags ) + PLINT nbin, PLINT flags ) { PLINT i, bin; PLFLT *x, *y, dx, ymax; Modified: trunk/src/plimage.c =================================================================== --- trunk/src/plimage.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plimage.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -86,9 +86,9 @@ */ void plimageslow( PLFLT *idata, PLINT nx, PLINT ny, - PLFLT xmin, PLFLT ymin, PLFLT dx, PLFLT dy, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLFLT xmin, PLFLT ymin, PLFLT dx, PLFLT dy, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { /* Indices */ PLINT ix, iy, i; @@ -189,10 +189,10 @@ \*-------------------------------------------------------------------------*/ void c_plimagefr( PLFLT **idata, PLINT nx, PLINT ny, - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin, PLFLT zmax, - PLFLT valuemin, PLFLT valuemax, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin, PLFLT zmax, + PLFLT valuemin, PLFLT valuemax, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT ix, iy; PLFLT dx, dy; @@ -309,8 +309,8 @@ \*-------------------------------------------------------------------------*/ void c_plimage( PLFLT **idata, PLINT nx, PLINT ny, - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin, PLFLT zmax, - PLFLT Dxmin, PLFLT Dxmax, PLFLT Dymin, PLFLT Dymax ) + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin, PLFLT zmax, + PLFLT Dxmin, PLFLT Dxmax, PLFLT Dymin, PLFLT Dymax ) { PLINT ix, iy, ixx, iyy, xm, ym, nnx, nny; PLFLT data_min, data_max, dx, dy; Modified: trunk/src/plline.c =================================================================== --- trunk/src/plline.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plline.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -41,7 +41,7 @@ static int clipline( PLINT *p_x1, PLINT *p_y1, PLINT *p_x2, PLINT *p_y2, - PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax ); + PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax ); /* General line-drawing routine. Takes line styles into account. */ @@ -560,8 +560,8 @@ void plP_pllclp( PLINT *x, PLINT *y, PLINT npts, - PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax, - void ( *draw )( short *, short *, PLINT )) + PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax, + void ( *draw )( short *, short *, PLINT )) { PLINT x1, x2, y1, y2; PLINT i, iclp = 0; @@ -705,8 +705,8 @@ void plP_plfclp( PLINT *x, PLINT *y, PLINT npts, - PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax, - void ( *draw )( short *, short *, PLINT )) + PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax, + void ( *draw )( short *, short *, PLINT )) { PLINT i, x1, x2, y1, y2; int iclp = 0, iout = 2; @@ -1160,7 +1160,7 @@ static int clipline( PLINT *p_x1, PLINT *p_y1, PLINT *p_x2, PLINT *p_y2, - PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax ) + PLINT xmin, PLINT xmax, PLINT ymin, PLINT ymax ) { PLINT t, dx, dy, flipx, flipy; double dydx = 0, dxdy = 0; Modified: trunk/src/plmap.c =================================================================== --- trunk/src/plmap.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plmap.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -87,7 +87,7 @@ void plmap( void ( *mapform )( PLINT, PLFLT *, PLFLT * ), const char *type, - PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat ) + PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat ) { PLINT wrap, sign; int i, j; @@ -266,8 +266,8 @@ void plmeridians( void ( *mapform )( PLINT, PLFLT *, PLFLT * ), - PLFLT dlong, PLFLT dlat, - PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat ) + PLFLT dlong, PLFLT dlat, + PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat ) { PLFLT yy, xx, temp, x[2], y[2], dx, dy; Modified: trunk/src/plot3d.c =================================================================== --- trunk/src/plot3d.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plot3d.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -57,8 +57,8 @@ static void plnxtv( PLINT *, PLINT *, PLFLT*, PLINT, PLINT ); static void plside3( PLFLT *, PLFLT *, PLFLT **, PLINT, PLINT, PLINT ); static void plt3zz( PLINT, PLINT, PLINT, PLINT, - PLINT, PLINT *, PLFLT *, PLFLT *, PLFLT **, - PLINT, PLINT, PLINT *, PLINT *, PLFLT* ); + PLINT, PLINT *, PLFLT *, PLFLT *, PLFLT **, + PLINT, PLINT, PLINT *, PLINT *, PLFLT* ); static void plnxtvhi( PLINT *, PLINT *, PLFLT*, PLINT, PLINT ); static void plnxtvlo( PLINT *, PLINT *, PLFLT*, PLINT, PLINT ); static void plnxtvhi_draw( PLINT *u, PLINT *v, PLFLT* c, PLINT n ); @@ -72,21 +72,21 @@ static void freework( void ); static int plabv( PLINT, PLINT, PLINT, PLINT, PLINT, PLINT ); static void pl3cut( PLINT, PLINT, PLINT, PLINT, PLINT, - PLINT, PLINT, PLINT, PLINT *, PLINT * ); + PLINT, PLINT, PLINT, PLINT *, PLINT * ); static PLFLT plGetAngleToLight( PLFLT* x, PLFLT* y, PLFLT* z ); static void plP_draw3d( PLINT x, PLINT y, PLFLT *c, PLINT j, PLINT move ); static void plxyindexlimits( PLINT instart, PLINT inn, - PLINT *inarray_min, PLINT *inarray_max, - PLINT *outstart, PLINT *outn, PLINT outnmax, - PLINT *outarray_min, PLINT *outarray_max ); + PLINT *inarray_min, PLINT *inarray_max, + PLINT *outstart, PLINT *outn, PLINT outnmax, + PLINT *outarray_min, PLINT *outarray_max ); /* #define MJL_HACK 1 */ #if MJL_HACK static void plP_fill3( PLINT x0, PLINT y0, PLINT x1, PLINT y1, - PLINT x2, PLINT y2, PLINT j ); + PLINT x2, PLINT y2, PLINT j ); static void plP_fill4( PLINT x0, PLINT y0, PLINT x1, PLINT y1, - PLINT x2, PLINT y2, PLINT x3, PLINT y3, PLINT j ); + PLINT x2, PLINT y2, PLINT x3, PLINT y3, PLINT j ); #endif /*--------------------------------------------------------------------------*\ @@ -139,7 +139,7 @@ void c_plmeshc( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, PLINT opt, - PLFLT *clevel, PLINT nlevel ) + PLFLT *clevel, PLINT nlevel ) { c_plot3dc( x, y, z, nx, ny, opt | MESH, clevel, nlevel ); } @@ -214,8 +214,8 @@ /* helper for plsurf3d, similar to c_plfill3() */ static void shade_triangle( PLFLT x0, PLFLT y0, PLFLT z0, - PLFLT x1, PLFLT y1, PLFLT z1, - PLFLT x2, PLFLT y2, PLFLT z2 ) + PLFLT x1, PLFLT y1, PLFLT z1, + PLFLT x2, PLFLT y2, PLFLT z2 ) { int i; /* arrays for interface to core functions */ @@ -278,7 +278,7 @@ void c_plsurf3d( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, - PLINT opt, PLFLT *clevel, PLINT nlevel ) + PLINT opt, PLFLT *clevel, PLINT nlevel ) { PLINT i; PLINT *indexymin = (PLINT *) malloc((size_t) ( nx * sizeof ( PLINT ))); @@ -333,8 +333,8 @@ void c_plsurf3dl( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, - PLINT opt, PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, PLINT *indexymin, PLINT *indexymax ) + PLINT opt, PLFLT *clevel, PLINT nlevel, + PLINT ixstart, PLINT ixn, PLINT *indexymin, PLINT *indexymax ) { PLFLT cxx, cxy, cyx, cyy, cyz; PLINT i, j, k; @@ -716,7 +716,7 @@ } if ( opt & DRAW_SIDES ) /* the sides look ugly !!! */ - { /* draw one more row with all the Z's set to zmin */ + { /* draw one more row with all the Z's set to zmin */ PLFLT zscale, zmin, zmax; plP_grange( &zscale, &zmin, &zmax ); @@ -792,7 +792,7 @@ void c_plot3d( PLFLT *x, PLFLT *y, PLFLT **z, - PLINT nx, PLINT ny, PLINT opt, PLBOOL side ) + PLINT nx, PLINT ny, PLINT opt, PLBOOL side ) { c_plot3dc( x, y, z, nx, ny, opt | ( side != 0 ? DRAW_SIDES : 0 ), NULL, 0 ); } @@ -808,8 +808,8 @@ void c_plot3dc( PLFLT *x, PLFLT *y, PLFLT **z, - PLINT nx, PLINT ny, PLINT opt, - PLFLT *clevel, PLINT nlevel ) + PLINT nx, PLINT ny, PLINT opt, + PLFLT *clevel, PLINT nlevel ) { c_plot3dcl( x, y, z, nx, ny, opt, clevel, nlevel, 0, 0, NULL, NULL ); } @@ -839,9 +839,9 @@ void c_plot3dcl( PLFLT *x, PLFLT *y, PLFLT **z, - PLINT nx, PLINT ny, PLINT opt, - PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, PLINT *indexymin, PLINT *indexymax ) + PLINT nx, PLINT ny, PLINT opt, + PLFLT *clevel, PLINT nlevel, + PLINT ixstart, PLINT ixn, PLINT *indexymin, PLINT *indexymax ) { PLFLT cxx, cxy, cyx, cyy, cyz; PLINT init, i, ix, iy, color, width; @@ -1333,9 +1333,9 @@ static void plxyindexlimits( PLINT instart, PLINT inn, - PLINT *inarray_min, PLINT *inarray_max, - PLINT *outstart, PLINT *outn, PLINT outnmax, - PLINT *outarray_min, PLINT *outarray_max ) + PLINT *inarray_min, PLINT *inarray_max, + PLINT *outstart, PLINT *outn, PLINT outnmax, + PLINT *outarray_min, PLINT *outarray_max ) { PLINT i, j; if ( inn < 0 ) @@ -1478,8 +1478,8 @@ static void plt3zz( PLINT x0, PLINT y0, PLINT dx, PLINT dy, PLINT flag, PLINT *init, - PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, - PLINT *u, PLINT *v, PLFLT* c ) + PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, + PLINT *u, PLINT *v, PLFLT* c ) { PLINT n = 0; PLFLT x2d, y2d; @@ -2555,7 +2555,7 @@ static void pl3cut( PLINT sx1, PLINT sy1, PLINT sx2, PLINT sy2, - PLINT su1, PLINT sv1, PLINT su2, PLINT sv2, PLINT *cx, PLINT *cy ) + PLINT su1, PLINT sv1, PLINT su2, PLINT sv2, PLINT *cx, PLINT *cy ) { PLINT x21, y21, u21, v21, yv1, xu1, a, b; double fa, fb; Modified: trunk/src/plshade.c =================================================================== --- trunk/src/plshade.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plshade.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -154,17 +154,17 @@ static void selected_polygon( void ( *fill )( PLINT, PLFLT *, PLFLT * ), - PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT *x, PLFLT *y, PLINT v1, PLINT v2, PLINT v3, PLINT v4 ); + PLINT ( *defined )( PLFLT, PLFLT ), + PLFLT *x, PLFLT *y, PLINT v1, PLINT v2, PLINT v3, PLINT v4 ); static void exfill( void ( *fill )( PLINT, PLFLT *, PLFLT * ), - PLINT ( *defined )( PLFLT, PLFLT ), - int n, PLFLT *x, PLFLT *y ); + PLINT ( *defined )( PLFLT, PLFLT ), + int n, PLFLT *x, PLFLT *y ); static void big_recl( int *cond_code, register int ny, int dx, int dy, - int *ix, int *iy ); + int *ix, int *iy ); static void draw_boundary( PLINT slope, PLFLT *x, PLFLT *y ); @@ -174,24 +174,24 @@ static PLINT plctestez( PLFLT *a, PLINT nx, PLINT ny, PLINT ix, - PLINT iy, PLFLT level ); + PLINT iy, PLFLT level ); static void plshade_int( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), - PLPointer c2eval_data, - PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT missing_min, PLFLT missing_max, - PLINT nx, PLINT ny, - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT shade_min, PLFLT shade_max, - PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, - PLINT min_color, PLINT min_width, - PLINT max_color, PLINT max_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ); + PLPointer f2eval_data, + PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), + PLPointer c2eval_data, + PLINT ( *defined )( PLFLT, PLFLT ), + PLFLT missing_min, PLFLT missing_max, + PLINT nx, PLINT ny, + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT shade_min, PLFLT shade_max, + PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, + PLINT min_color, PLINT min_width, + PLINT max_color, PLINT max_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ); /*----------------------------------------------------------------------*\ * plshades() @@ -207,12 +207,12 @@ \*----------------------------------------------------------------------*/ void c_plshades( PLFLT **a, PLINT nx, PLINT ny, PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT *clevel, PLINT nlevel, PLINT fill_width, - PLINT cont_color, PLINT cont_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT *clevel, PLINT nlevel, PLINT fill_width, + PLINT cont_color, PLINT cont_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLFLT shade_min, shade_max, shade_color; PLINT i, init_color, init_width; @@ -286,14 +286,14 @@ \*----------------------------------------------------------------------*/ void c_plshade( PLFLT **a, PLINT nx, PLINT ny, PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT shade_min, PLFLT shade_max, - PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, - PLINT min_color, PLINT min_width, - PLINT max_color, PLINT max_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT shade_min, PLFLT shade_max, + PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, + PLINT min_color, PLINT min_width, + PLINT max_color, PLINT max_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLfGrid2 grid; @@ -320,14 +320,14 @@ \*----------------------------------------------------------------------*/ void c_plshade1( PLFLT *a, PLINT nx, PLINT ny, PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT shade_min, PLFLT shade_max, - PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, - PLINT min_color, PLINT min_width, - PLINT max_color, PLINT max_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT shade_min, PLFLT shade_max, + PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, + PLINT min_color, PLINT min_width, + PLINT max_color, PLINT max_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLfGrid grid; @@ -354,18 +354,18 @@ void plfshade( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), - PLPointer c2eval_data, - PLINT nx, PLINT ny, - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT shade_min, PLFLT shade_max, - PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, - PLINT min_color, PLINT min_width, - PLINT max_color, PLINT max_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), + PLPointer c2eval_data, + PLINT nx, PLINT ny, + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT shade_min, PLFLT shade_max, + PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, + PLINT min_color, PLINT min_width, + PLINT max_color, PLINT max_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { plshade_int( f2eval, f2eval_data, c2eval, c2eval_data, NULL, MISSING_MIN_DEF, MISSING_MAX_DEF, @@ -417,20 +417,20 @@ static void plshade_int( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), - PLPointer c2eval_data, - PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT missing_min, PLFLT missing_max, - PLINT nx, PLINT ny, - PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLFLT shade_min, PLFLT shade_max, - PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, - PLINT min_color, PLINT min_width, - PLINT max_color, PLINT max_width, - void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), + PLPointer c2eval_data, + PLINT ( *defined )( PLFLT, PLFLT ), + PLFLT missing_min, PLFLT missing_max, + PLINT nx, PLINT ny, + PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, + PLFLT shade_min, PLFLT shade_max, + PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, + PLINT min_color, PLINT min_width, + PLINT max_color, PLINT max_width, + void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT init_width, n, slope = 0, ix, iy; int count, i, j, nxny; @@ -838,8 +838,8 @@ static void selected_polygon( void ( *fill )( PLINT, PLFLT *, PLFLT * ), - PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT *x, PLFLT *y, PLINT v1, PLINT v2, PLINT v3, PLINT v4 ) + PLINT ( *defined )( PLFLT, PLFLT ), + PLFLT *x, PLFLT *y, PLINT v1, PLINT v2, PLINT v3, PLINT v4 ) { register PLINT n = 0; PLFLT xx[4], yy[4]; @@ -879,7 +879,7 @@ static void bisect( PLINT ( *defined )( PLFLT, PLFLT ), PLINT niter, - PLFLT x1, PLFLT y1, PLFLT x2, PLFLT y2, PLFLT* xb, PLFLT* yb ) + PLFLT x1, PLFLT y1, PLFLT x2, PLFLT y2, PLFLT* xb, PLFLT* yb ) { PLFLT xm; PLFLT ym; @@ -909,8 +909,8 @@ static void exfill( void ( *fill )( PLINT, PLFLT *, PLFLT * ), - PLINT ( *defined )( PLFLT, PLFLT ), - int n, PLFLT *x, PLFLT *y ) + PLINT ( *defined )( PLFLT, PLFLT ), + int n, PLFLT *x, PLFLT *y ) { if ( defined == NULL ) @@ -994,7 +994,7 @@ static void big_recl( int *cond_code, register int ny, int dx, int dy, - int *ix, int *iy ) + int *ix, int *iy ) { int ok_x, ok_y, j; register int i, x, y; @@ -1218,7 +1218,7 @@ static PLINT plctestez( PLFLT *a, PLINT nx, PLINT ny, PLINT ix, - PLINT iy, PLFLT level ) + PLINT iy, PLFLT level ) { PLFLT x[4][4]; int i, j, ii, jj; Modified: trunk/src/plstripc.c =================================================================== --- trunk/src/plstripc.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plstripc.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -66,12 +66,12 @@ void c_plstripc( PLINT *id, const char *xspec, const char *yspec, - PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax, - PLFLT xlpos, PLFLT ylpos, - PLINT y_ascl, PLINT acc, - PLINT colbox, PLINT collab, - PLINT *colline, PLINT *styline, const char *legline[], - const char *labx, const char *laby, const char *labtop ) + PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax, + PLFLT xlpos, PLFLT ylpos, + PLINT y_ascl, PLINT acc, + PLINT colbox, PLINT collab, + PLINT *colline, PLINT *styline, const char *legline[], + const char *labx, const char *laby, const char *labtop ) { int i; Modified: trunk/src/plsym.c =================================================================== --- trunk/src/plsym.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plsym.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -65,8 +65,8 @@ static void plchar( signed char *xygrid, PLFLT *xform, PLINT base, PLINT oline, PLINT uline, - PLINT refx, PLINT refy, PLFLT scale, PLFLT xpmm, PLFLT ypmm, - PLFLT *p_xorg, PLFLT *p_yorg, PLFLT *p_width ); + PLINT refx, PLINT refy, PLFLT scale, PLFLT xpmm, PLFLT ypmm, + PLFLT *p_xorg, PLFLT *p_yorg, PLFLT *p_width ); static PLINT plcvec( PLINT ch, signed char **xygr ); @@ -450,7 +450,7 @@ void c_plmtex( const char *side, PLFLT disp, PLFLT pos, PLFLT just, - const char *text ) + const char *text ) { PLINT clpxmi, clpxma, clpymi, clpyma; PLINT vert, refx, refy, x, y; @@ -716,8 +716,8 @@ static void plchar( signed char *vxygrid, PLFLT *xform, PLINT base, PLINT oline, PLINT uline, - PLINT refx, PLINT refy, PLFLT scale, PLFLT xpmm, PLFLT ypmm, - PLFLT *p_xorg, PLFLT *p_yorg, PLFLT *p_width ) + PLINT refx, PLINT refy, PLFLT scale, PLFLT xpmm, PLFLT ypmm, + PLFLT *p_xorg, PLFLT *p_yorg, PLFLT *p_width ) { PLINT xbase, ybase, ydisp, lx, ly, cx, cy; PLINT k, penup; @@ -1293,7 +1293,7 @@ char * plP_FCI2FontName( PLUNICODE fci, - const FCI_to_FontName_Table lookup[], const int nlookup ) + const FCI_to_FontName_Table lookup[], const int nlookup ) { int jlo = -1, jmid, jhi = nlookup; while ( jhi - jlo > 1 ) @@ -1727,7 +1727,7 @@ void c_plptex3( PLFLT wx, PLFLT wy, PLFLT wz, PLFLT dx, PLFLT dy, PLFLT dz, - PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, const char *text ) + PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, const char *text ) { PLFLT xpc, ypc, xrefpc, yrefpc, xdpc, ydpc, xspc, yspc, ld, ls, cp, shift; PLFLT x_o, y_o, z_o, x_dx, y_dy, z_dz; Modified: trunk/src/plvect.c =================================================================== --- trunk/src/plvect.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plvect.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -115,10 +115,10 @@ * and vector transformations */ void plfvect( PLFLT ( *plf2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data1, PLPointer f2eval_data2, - PLINT nx, PLINT ny, PLFLT scale, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data1, PLPointer f2eval_data2, + PLINT nx, PLINT ny, PLFLT scale, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT i, j, i1, j1; PLFLT **u, **v, **x, **y; @@ -211,8 +211,8 @@ void c_plvect( PLFLT **u, PLFLT **v, PLINT nx, PLINT ny, PLFLT scale, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLfGrid2 grid1, grid2; Modified: trunk/src/plvpor.c =================================================================== --- trunk/src/plvpor.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plvpor.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -25,7 +25,7 @@ static void c_plenvi( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLINT just, PLINT axis, PLINT old ); + PLINT just, PLINT axis, PLINT old ); /*--------------------------------------------------------------------------*\ * void plenv() @@ -89,7 +89,7 @@ void c_plenv( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLINT just, PLINT axis ) + PLINT just, PLINT axis ) { c_plenvi( xmin, xmax, ymin, ymax, just, axis, 1 ); } @@ -103,7 +103,7 @@ void c_plenv0( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLINT just, PLINT axis ) + PLINT just, PLINT axis ) { c_plenvi( xmin, xmax, ymin, ymax, just, axis, 0 ); } @@ -111,7 +111,7 @@ static void c_plenvi( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, - PLINT just, PLINT axis, PLINT old ) + PLINT just, PLINT axis, PLINT old ) { PLFLT lb, rb, tb, bb, dx, dy; PLFLT xsize, ysize, size, xscale, yscale, scale; Modified: trunk/src/plwind.c =================================================================== --- trunk/src/plwind.c 2009-09-24 19:29:38 UTC (rev 10472) +++ trunk/src/plwind.c 2009-09-24 19:38:19 UTC (rev 10473) @@ -137,8 +137,8 @@ void c_plw3d( PLFLT basex, PLFLT basey, PLFLT height, PLFLT xmin0, - PLFLT xmax0, PLFLT ymin0, PLFLT ymax0, PLFLT zmin0, - PLFLT zmax0, PLFLT alt, PLFLT az ) + PLFLT xmax0, PLFLT ymin0, PLFLT ymax0, PLFLT zmin0, + PLFLT zmax0, PLFLT alt, PLFLT az ) { PLFLT xmin, xmax, ymin, ymax, zmin, zmax, d; PLFLT cx, cy, saz, caz, salt, calt, zscale; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |