Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12281] trunk
|
From: <and...@us...> - 2012-11-23 21:27:57
|
Revision: 12281
http://plplot.svn.sourceforge.net/plplot/?rev=12281&view=rev
Author: andrewross
Date: 2012-11-23 21:27:51 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Format recent code changes using scripts/style_source.sh.
Modified Paths:
--------------
trunk/bindings/c++/plstream.cc
trunk/bindings/octave/plplot_octave.i
trunk/drivers/wxwidgets.cpp
trunk/examples/c/x33c.c
trunk/examples/c++/x16.cc
trunk/src/pllegend.c
trunk/src/plmap.c
Modified: trunk/bindings/c++/plstream.cc
===================================================================
--- trunk/bindings/c++/plstream.cc 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/bindings/c++/plstream.cc 2012-11-23 21:27:51 UTC (rev 12281)
@@ -1029,7 +1029,7 @@
plcolorbar( p_colorbar_width, p_colorbar_height, opt, position, x, y,
x_length, y_length, bg_color, bb_color, bb_style,
low_cap_color, high_cap_color, cont_color, cont_width,
- n_labels, label_opts, label,n_axes, axis_opts,
+ n_labels, label_opts, label, n_axes, axis_opts,
ticks, sub_ticks, n_values, values );
}
Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/bindings/octave/plplot_octave.i 2012-11-23 21:27:51 UTC (rev 12281)
@@ -34,7 +34,6 @@
%module plplot_octave
%{
-
// #undef PACKAGE and VERSION macros which are leaked out by the octave headers
#undef PACKAGE
#undef VERSION
@@ -671,12 +670,12 @@
%typemap( in, numinputs = 0 ) char *OUTPUT( octave_value_list retval )
{
// Check if version >= 3.4.0
-%#if OCTAVE_API_VERSION_NUMBER < 45
+%# if OCTAVE_API_VERSION_NUMBER < 45
retval( 0 ) = octave_value( charMatrix( 80, 1 ), true );
-%#else
- retval( 0 ) = octave_value( charMatrix( 80, 1 ) );
-%#endif
- $1 = (char *) retval( 0 ).char_matrix_value().data();
+%# else
+ retval( 0 ) = octave_value( charMatrix( 80, 1 ) );
+%# endif
+ $1 = (char *) retval( 0 ).char_matrix_value().data();
}
%typemap( argout ) char *OUTPUT {
$result = SWIG_Octave_AppendOutput( $result, retval$argnum( 0 ) );
Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/drivers/wxwidgets.cpp 2012-11-23 21:27:51 UTC (rev 12281)
@@ -331,7 +331,7 @@
// Log_Verbose( "common_init()" );
wxPLDevBase* dev;
- PLFLT downscale, downscale2;
+ PLFLT downscale, downscale2;
// default options
static PLINT freetype = -1;
@@ -481,7 +481,7 @@
plP_setpxl( (PLFLT) VIRTUAL_PIXELS_PER_MM, (PLFLT) VIRTUAL_PIXELS_PER_MM );
// Set up physical limits of plotting device (in drawing units)
- downscale = (double) dev->width / (double) ( PIXELS_X - 1 );
+ downscale = (double) dev->width / (double) ( PIXELS_X - 1 );
downscale2 = (double) dev->height / (double) PIXELS_Y;
if ( downscale < downscale2 )
downscale = downscale2;
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/examples/c/x33c.c 2012-11-23 21:27:51 UTC (rev 12281)
@@ -156,7 +156,7 @@
// Parameters for the colorbars on this page
PLINT position_i, position, opt;
PLFLT x, y, x_length, y_length;
- PLFLT ticks[1] = { 0.0 };
+ PLFLT ticks[1] = { 0.0 };
PLINT sub_ticks[1] = { 0 };
PLFLT low_cap_color, high_cap_color;
PLINT vertical, ifn;
Modified: trunk/examples/c++/x16.cc
===================================================================
--- trunk/examples/c++/x16.cc 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/examples/c++/x16.cc 2012-11-23 21:27:51 UTC (rev 12281)
@@ -278,7 +278,7 @@
pls->colorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
- cont_color, cont_width,
+ cont_color, cont_width,
n_labels, label_opts, labels,
n_axis_opts, axis_opts,
axis_ticks, axis_subticks,
@@ -325,7 +325,7 @@
pls->colorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
- cont_color, cont_width,
+ cont_color, cont_width,
n_labels, label_opts, labels,
n_axis_opts, axis_opts,
axis_ticks, axis_subticks,
@@ -373,7 +373,7 @@
pls->colorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
- cont_color, cont_width,
+ cont_color, cont_width,
n_labels, label_opts, labels,
n_axis_opts, axis_opts,
axis_ticks, axis_subticks,
@@ -422,7 +422,7 @@
pls->colorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
- 2, 3,
+ 2, 3,
n_labels, label_opts, labels,
n_axis_opts, axis_opts,
axis_ticks, axis_subticks,
Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/src/pllegend.c 2012-11-23 21:27:51 UTC (rev 12281)
@@ -1660,8 +1660,8 @@
adopted_to_subpage_x( 0. );
colorbar_height = adopted_to_subpage_y( y_length ) -
adopted_to_subpage_y( 0. );
- colorbar_width_d = colorbar_width;
- colorbar_height_d = colorbar_height;
+ colorbar_width_d = colorbar_width;
+ colorbar_height_d = colorbar_height;
colorbar_width_mm = colorbar_width / spxpmm;
colorbar_height_mm = colorbar_height / spypmm;
// Extent of cap in normalized subpage coordinates in either X or Y
@@ -1775,7 +1775,7 @@
}
// Capture the current bounding box dimensions
- colorbar_width_l = colorbar_width_d;
+ colorbar_width_l = colorbar_width_d;
colorbar_height_l = colorbar_height_d;
for ( i = 0; i < n_labels; i++ )
Modified: trunk/src/plmap.c
===================================================================
--- trunk/src/plmap.c 2012-11-23 21:25:40 UTC (rev 12280)
+++ trunk/src/plmap.c 2012-11-23 21:27:51 UTC (rev 12281)
@@ -111,7 +111,7 @@
plmap( void ( *mapform )( PLINT, PLFLT *, PLFLT * ), const char *type,
PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat )
{
-#if defined (HAVE_SHAPELIB) || defined (PL_DEPRECATED)
+#if defined ( HAVE_SHAPELIB ) || defined ( PL_DEPRECATED )
int i, j;
char *filename;
char *warning;
@@ -346,9 +346,9 @@
free( bufy );
free( filename );
free( warning );
-#else // defined (HAVE_SHAPELIB) || defined (PL_DEPRECATED)
+#else // defined (HAVE_SHAPELIB) || defined (PL_DEPRECATED)
plwarn( "Use of the old plplot map file format is deprecated.\nIt is recommended that the shapelib library be used to provide map support.\n" );
-#endif // defined (HAVE_SHAPELIB) || defined (PL_DEPRECATED)
+#endif // defined (HAVE_SHAPELIB) || defined (PL_DEPRECATED)
}
//--------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
