From: <ai...@us...> - 2012-01-22 00:21:32
|
Revision: 12146 http://plplot.svn.sourceforge.net/plplot/?rev=12146&view=rev Author: airwin Date: 2012-01-22 00:21:26 +0000 (Sun, 22 Jan 2012) Log Message: ----------- Style previously committed changes. Modified Paths: -------------- trunk/bindings/d/plplot.d trunk/bindings/java/plplotjavac.i trunk/drivers/psttf.cc trunk/include/plplot.h Modified: trunk/bindings/d/plplot.d =================================================================== --- trunk/bindings/d/plplot.d 2012-01-21 21:58:15 UTC (rev 12145) +++ trunk/bindings/d/plplot.d 2012-01-22 00:21:26 UTC (rev 12146) @@ -2083,7 +2083,7 @@ void c_plstart( char *devname, PLINT nx, PLINT ny ); // Set the coordinate transform -void c_plstransform( ct_func coordinate_transform = null , PLPointer coordinate_transform_data = null); +void c_plstransform( ct_func coordinate_transform = null, PLPointer coordinate_transform_data = null ); // Add a point to a stripchart. void c_plstripa( PLINT id, PLINT pen, PLFLT x, PLFLT y ); Modified: trunk/bindings/java/plplotjavac.i =================================================================== --- trunk/bindings/java/plplotjavac.i 2012-01-21 21:58:15 UTC (rev 12145) +++ trunk/bindings/java/plplotjavac.i 2012-01-22 00:21:26 UTC (rev 12146) @@ -326,10 +326,10 @@ // I hate global variables but this is the best way I can think of to manage consistency // checking among function arguments. %{ - static PLINT Alen = 0; - static PLINT Xlen = 0, Ylen = 0; - static PLFLT **xg; - static PLFLT **yg; + static PLINT Alen = 0; + static PLINT Xlen = 0, Ylen = 0; + static PLFLT **xg; + static PLFLT **yg; static PLcGrid2 *cgrid; %} @@ -1532,11 +1532,11 @@ // Second of two object arrays, where we check X and Y with previous object. %typemap( in ) PLPointer OBJECT_DATA { - jPLFLT **adat; - jobject *ai; - int nx = ( *jenv )->GetArrayLength( jenv, $input ); - int ny = -1; - int i, j; + jPLFLT **adat; + jobject *ai; + int nx = ( *jenv )->GetArrayLength( jenv, $input ); + int ny = -1; + int i, j; ai = (jobject *) malloc( nx * sizeof ( jobject ) ); adat = (jPLFLT **) malloc( nx * sizeof ( jPLFLT * ) ); @@ -1580,12 +1580,12 @@ free( adat ); free( ai ); - cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) ); + cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) ); cgrid->xg = xg; cgrid->yg = yg; cgrid->nx = nx; cgrid->ny = ny; - $1 = cgrid; + $1 = cgrid; } %typemap( freearg ) PLPointer OBJECT_DATA { @@ -1676,11 +1676,11 @@ // This is the version for plimagefr where size is 1 larger than previous // array %typemap( in ) PLPointer OBJECT_DATA_img { - jPLFLT **adat; - jobject *ai; - int nx = ( *jenv )->GetArrayLength( jenv, $input ); - int ny = -1; - int i, j; + jPLFLT **adat; + jobject *ai; + int nx = ( *jenv )->GetArrayLength( jenv, $input ); + int ny = -1; + int i, j; ai = (jobject *) malloc( nx * sizeof ( jobject ) ); adat = (jPLFLT **) malloc( nx * sizeof ( jPLFLT * ) ); @@ -1724,7 +1724,7 @@ free( adat ); free( ai ); - cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) ); + cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) ); cgrid->xg = xg; cgrid->yg = yg; cgrid->nx = nx; Modified: trunk/drivers/psttf.cc =================================================================== --- trunk/drivers/psttf.cc 2012-01-21 21:58:15 UTC (rev 12145) +++ trunk/drivers/psttf.cc 2012-01-22 00:21:26 UTC (rev 12146) @@ -451,7 +451,7 @@ doc->osHeader() << "PSDict begin\n"; doc->osHeader() << "@start\n"; - doc->osHeader() << COPIES << " @copies\n" ; + doc->osHeader() << COPIES << " @copies\n"; doc->osHeader() << "@line\n"; doc->osHeader() << YSIZE << " @hsize\n"; doc->osHeader() << XSIZE << " @vsize\n"; Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2012-01-21 21:58:15 UTC (rev 12145) +++ trunk/include/plplot.h 2012-01-22 00:21:26 UTC (rev 12146) @@ -766,17 +766,17 @@ #ifdef PL_DEPRECATED -#define plclr pleop -#define plpage plbop -#define plcol plcol0 -#define plcontf plfcont +#define plclr pleop +#define plpage plbop +#define plcol plcol0 +#define plcontf plfcont // Comment out these as they can upset the C++ bindings since the C++ -// bindings use the function names without the pl prefix. +// bindings use the function names without the pl prefix. //#define Alloc2dGrid plAlloc2dGrid //#define Free2dGrid plFree2dGrid //#define MinMax2dGrid plMinMax2dGrid -#define plP_gvpd plgvpd -#define plP_gvpw plgvpw +#define plP_gvpd plgvpd +#define plP_gvpw plgvpw #define plotsh3d( x, y, z, nx, ny, opt ) plsurf3d( x, y, z, nx, ny, opt, NULL, 0 ) #endif // PL_DEPRECATED This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |