Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11759] trunk
|
From: <ai...@us...> - 2011-06-01 17:41:41
|
Revision: 11759
http://plplot.svn.sourceforge.net/plplot/?rev=11759&view=rev
Author: airwin
Date: 2011-06-01 17:41:34 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Style changes:
Remove whitespace just inside cast parentheses. This is the style we
already have in most cases, but force this in all cases now for
consistency.
Force removal of any spaces between pointer stars. (i.e., "* *" ==>
"**"). This is our uniform style now in any case (i.e. it introduces
no source code changes). However, this change is needed for when (in
the immediate future) we move to uncrustify-0.58 to work around an
issue (all "**" instances were being changed to "* *" inside casts)
for that version of uncrustify.
Modified Paths:
--------------
trunk/bindings/f77/sccont.c
trunk/src/plcont.c
trunk/src/plimage.c
trunk/src/plshade.c
trunk/src/plvect.c
trunk/uncrustify.cfg
Modified: trunk/bindings/f77/sccont.c
===================================================================
--- trunk/bindings/f77/sccont.c 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/bindings/f77/sccont.c 2011-06-01 17:41:34 UTC (rev 11759)
@@ -399,7 +399,7 @@
*shade_min, *shade_max,
*sh_cmap, *sh_color, *sh_width,
*min_color, *min_width, *max_color, *max_width,
- c_plfill, rect, pltr, ( PLPointer ) ftr );
+ c_plfill, rect, pltr, (PLPointer) ftr );
}
//--------------------------------------------------------------------------
Modified: trunk/src/plcont.c
===================================================================
--- trunk/src/plcont.c 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/src/plcont.c 2011-06-01 17:41:34 UTC (rev 11759)
@@ -280,7 +280,7 @@
plP_drawor( tpx, tpy );
- if ( (int ) ( fabs( *distance / contlabel_space ) ) > *lastindex )
+ if ( (int) ( fabs( *distance / contlabel_space ) ) > *lastindex )
{
PLFLT scale, vec_x, vec_y, mx, my, dev_x, dev_y, off_x, off_y;
@@ -294,8 +294,8 @@
vec_y = -vec_y;
}
- mx = (double ) plsc->wpxscl / (double ) plsc->phyxlen;
- my = (double ) plsc->wpyscl / (double ) plsc->phyylen;
+ mx = (double) plsc->wpxscl / (double) plsc->phyxlen;
+ my = (double) plsc->wpyscl / (double) plsc->phyylen;
dev_x = -my * vec_y / mx;
dev_y = mx * vec_x / my;
@@ -352,20 +352,20 @@
tmp = 0;
if ( tmp >= 0.0 )
- exponent = (int ) tmp;
+ exponent = (int) tmp;
else if ( tmp < 0.0 )
{
tmp = -tmp;
if ( floor( tmp ) < tmp )
- exponent = -(int ) ( floor( tmp ) + 1.0 );
+ exponent = -(int) ( floor( tmp ) + 1.0 );
else
- exponent = -(int ) ( floor( tmp ) );
+ exponent = -(int) ( floor( tmp ) );
}
mant = value / pow( 10.0, exponent );
if ( mant != 0.0 )
- mant = (int ) ( mant * pow( 10.0, prec - 1 ) + 0.5 * mant / fabs( mant ) ) / pow( 10.0, prec - 1 );
+ mant = (int) ( mant * pow( 10.0, prec - 1 ) + 0.5 * mant / fabs( mant ) ) / pow( 10.0, prec - 1 );
snprintf( form, FORM_LEN, "%%.%df", prec - 1 );
snprintf( string, len, form, mant );
@@ -524,7 +524,7 @@
return;
}
- plfcont( plf2eval1, ( PLPointer ) f,
+ plfcont( plf2eval1, (PLPointer) f,
nx, ny, kx, lx, ky, ly, clevel, nlevel,
pltr, pltr_data );
}
Modified: trunk/src/plimage.c
===================================================================
--- trunk/src/plimage.c 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/src/plimage.c 2011-06-01 17:41:34 UTC (rev 11759)
@@ -194,7 +194,7 @@
void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ),
PLPointer pltr_data )
{
- plfimagefr( plf2ops_c(), ( PLPointer ) idata, nx, ny,
+ plfimagefr( plf2ops_c(), (PLPointer) idata, nx, ny,
xmin, xmax, ymin, ymax, zmin, zmax,
valuemin, valuemax, pltr, pltr_data );
}
Modified: trunk/src/plshade.c
===================================================================
--- trunk/src/plshade.c 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/src/plshade.c 2011-06-01 17:41:34 UTC (rev 11759)
@@ -333,7 +333,7 @@
void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ),
PLPointer pltr_data )
{
- plshade_int( plf2eval1, ( PLPointer ) a,
+ plshade_int( plf2eval1, (PLPointer) a,
NULL, NULL,
// plc2eval, (PLPointer) &cgrid,
defined, MISSING_MIN_DEF, MISSING_MAX_DEF, nx, ny, xmin,
Modified: trunk/src/plvect.c
===================================================================
--- trunk/src/plvect.c 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/src/plvect.c 2011-06-01 17:41:34 UTC (rev 11759)
@@ -217,6 +217,6 @@
void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ),
PLPointer pltr_data )
{
- plfvect( plf2eval1, ( PLPointer ) u, ( PLPointer ) v,
+ plfvect( plf2eval1, (PLPointer) u, (PLPointer) v,
nx, ny, scale, pltr, pltr_data );
}
Modified: trunk/uncrustify.cfg
===================================================================
--- trunk/uncrustify.cfg 2011-05-31 09:02:36 UTC (rev 11758)
+++ trunk/uncrustify.cfg 2011-06-01 17:41:34 UTC (rev 11759)
@@ -250,7 +250,7 @@
sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force
# Add or remove space between pointer stars '*'
-sp_between_ptr_star = ignore # ignore/add/remove/force
+sp_between_ptr_star = remove # ignore/add/remove/force
# Add or remove space after pointer star '*', if followed by a word.
sp_after_ptr_star = ignore # ignore/add/remove/force
@@ -378,7 +378,7 @@
sp_after_cast = force # ignore/add/remove/force
# Add or remove spaces inside cast parens
-sp_inside_paren_cast = ignore # ignore/add/remove/force
+sp_inside_paren_cast = remove # ignore/add/remove/force
# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'
sp_cpp_cast_paren = ignore # ignore/add/remove/force
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
