From: <ai...@us...> - 2012-01-14 23:18:00
|
Revision: 12128 http://plplot.svn.sourceforge.net/plplot/?rev=12128&view=rev Author: airwin Date: 2012-01-14 23:17:53 +0000 (Sat, 14 Jan 2012) Log Message: ----------- Style previous commits. Modified Paths: -------------- trunk/bindings/tk/plframe.c trunk/bindings/tk/plserver.c trunk/drivers/cairo.c trunk/drivers/psttf.cc trunk/drivers/test-drv-info.c trunk/examples/c++/x15.cc trunk/src/plcore.c trunk/src/pllegend.c trunk/src/plstdio.c trunk/utils/pltek.c Modified: trunk/bindings/tk/plframe.c =================================================================== --- trunk/bindings/tk/plframe.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/bindings/tk/plframe.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -3274,7 +3274,7 @@ int argc, const char **argv ) { PLFLT x, y; - char tmpstring[50]; + char tmpstring[50]; // fprintf( stdout, "Made it into report, argc=%d\n", argc ); if ( argc == 0 ) Modified: trunk/bindings/tk/plserver.c =================================================================== --- trunk/bindings/tk/plserver.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/bindings/tk/plserver.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -253,11 +253,11 @@ static int plExitCmd( ClientData PL_UNUSED( clientData ), Tcl_Interp *interp, int argc, char **argv ) { - int value = 0; + int value = 0; const char *res; // Print error message if one given - + res = Tcl_GetStringResult( interp ); if ( res[0] != '\0' ) fprintf( stderr, "%s\n", res ); Modified: trunk/drivers/cairo.c =================================================================== --- trunk/drivers/cairo.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/drivers/cairo.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -522,7 +522,6 @@ void plD_esc_cairo( PLStream *pls, PLINT op, void *ptr ) { - switch ( op ) { case PLESC_FILL: // filled polygon Modified: trunk/drivers/psttf.cc =================================================================== --- trunk/drivers/psttf.cc 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/drivers/psttf.cc 2012-01-14 23:17:53 UTC (rev 12128) @@ -848,16 +848,16 @@ // Be generous. Used to store lots of font changes which take // 3 characters per change. #define PROC_STR_STRING_LENGTH 1000 - char *strp, str[PROC_STR_STRING_LENGTH], *cur_strp, - cur_str[PROC_STR_STRING_LENGTH]; - float font_factor = 1.4; - PLINT clxmin, clxmax, clymin, clymax; // Clip limits - PLINT clipx[4], clipy[4]; // Current clip limits + char *strp, str[PROC_STR_STRING_LENGTH], *cur_strp, + cur_str[PROC_STR_STRING_LENGTH]; + float font_factor = 1.4; + PLINT clxmin, clxmax, clymin, clymax; // Clip limits + PLINT clipx[4], clipy[4]; // Current clip limits - PLFLT scale = 1., up = 0.; // Font scaling and shifting parameters + PLFLT scale = 1., up = 0.; // Font scaling and shifting parameters - double lineSpacing, xAdvance, ymintmp, ymaxtmp, ymin, ymax, xmin, xmax; - PLINT xx[4], yy[4]; + double lineSpacing, xAdvance, ymintmp, ymaxtmp, ymin, ymax, xmin, xmax; + PLINT xx[4], yy[4]; // unicode only! so test for it. if ( args->unicode_array_len > 0 ) Modified: trunk/drivers/test-drv-info.c =================================================================== --- trunk/drivers/test-drv-info.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/drivers/test-drv-info.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -17,7 +17,7 @@ // // You should have received a copy of the GNU Library General Public License // along with the GNU C Library; see the file COPYING.LIB. If not, write to -// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, // MA 02110-1301, USA. // Modified: trunk/examples/c++/x15.cc =================================================================== --- trunk/examples/c++/x15.cc 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/examples/c++/x15.cc 2012-01-14 23:17:53 UTC (rev 12128) @@ -41,14 +41,14 @@ private: // Class data - plstream *pls; + plstream *pls; - const static int XPTS; - const static int YPTS; + const static int XPTS; + const static int YPTS; }; -const int x15:: XPTS = 35; -const int x15:: YPTS = 46; +const int x15:: XPTS = 35; +const int x15:: YPTS = 46; x15::x15( int argc, const char ** argv ) Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/src/plcore.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -1948,7 +1948,7 @@ x0 = ( plsc->phyxma + plsc->phyxmi ) / 2.; y0 = ( plsc->phyyma + plsc->phyymi ) / 2.; -// Rotation +// Rotation cost = ABS( cos( plsc->diorot * PI / 2. ) ); sint = ABS( sin( plsc->diorot * PI / 2. ) ); Modified: trunk/src/pllegend.c =================================================================== --- trunk/src/pllegend.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/src/pllegend.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -573,7 +573,7 @@ PLFLT x_legend_position, y_legend_position, xsign, ysign; //PLINT some_boxes = 0, some_lines = 0; - PLINT some_symbols = 0; + PLINT some_symbols = 0; PLINT max_symbol_numbers = 0; PLINT irow = 0, icolumn = 0; Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/src/plstdio.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -99,7 +99,7 @@ bytes = fread( buf, size, nmemb, stream ); - if ( (bytes < nmemb) && ferror( stream ) ) + if ( ( bytes < nmemb ) && ferror( stream ) ) { // The read resulted in an error plabort( "Error reading from file" ); Modified: trunk/utils/pltek.c =================================================================== --- trunk/utils/pltek.c 2012-01-13 02:06:02 UTC (rev 12127) +++ trunk/utils/pltek.c 2012-01-14 23:17:53 UTC (rev 12128) @@ -30,13 +30,13 @@ int main( int argc, char *argv[] ) { - FILE *fd; - int i, npage, ipage, ifirst, oldpage; + FILE *fd; + int i, npage, ipage, ifirst, oldpage; size_t j, nb; - int istop; - long start[MAXPAGES]; // start (offset) of each page - char buf[BUFSZ], xtra, lastchar = '\0'; - char c, ibuf[128], *t; + int istop; + long start[MAXPAGES]; // start (offset) of each page + char buf[BUFSZ], xtra, lastchar = '\0'; + char c, ibuf[128], *t; if ( argc < 2 ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |