Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11760] trunk
|
From: <ai...@us...> - 2011-06-01 19:29:21
|
Revision: 11760
http://plplot.svn.sourceforge.net/plplot/?rev=11760&view=rev
Author: airwin
Date: 2011-06-01 19:29:11 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Move from uncrustify 0.56 to 0.58.
For this new version of uncrustify, we have regenerated
uncrustify.cfg using the following commands:
uncrustify -c uncrustify.cfg --update-config-with-doc > new_config_file
mv new_config_file uncrustify.cfg
0.58 does more complete processing of spaces inside casts than
was done for 0.56. So the vast majority of these source-code changes
involve inserting spaces inside casts where none appeared before.
e.g., (void*) ==> (void *) to be consistent with how, e.g., void *
is styled for spacing outside casts.
The remaining source code changes are almost entirely due to improved
alignment processing for 0.58.
Modified Paths:
--------------
trunk/bindings/c++/plstream.h
trunk/bindings/gnome2/lib/gcw-lib.c
trunk/bindings/gnome2/lib/plplotcanvas.c
trunk/bindings/java/plplotjavac.i
trunk/bindings/lua/plplotluac.i
trunk/bindings/ocaml/plplot_impl.c
trunk/bindings/octave/plplot_octave.i
trunk/bindings/python/plplotcmodule.i
trunk/bindings/qt_gui/plqt.cpp
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tcl/tclMatrix.c
trunk/bindings/tk/Pltk_Init.c
trunk/bindings/tk/plframe.c
trunk/bindings/tk/plserver.c
trunk/bindings/tk/tkshell.c
trunk/bindings/tk-x-plat/Plplotter_Init.c
trunk/bindings/tk-x-plat/plplotter.c
trunk/bindings/wxwidgets/wxPLplotstream.cpp
trunk/bindings/wxwidgets/wxPLplotwindow.cpp
trunk/bindings/wxwidgets/wxPLplotwindow.h
trunk/drivers/aqt.c
trunk/drivers/cairo.c
trunk/drivers/gcw.c
trunk/drivers/pbm.c
trunk/drivers/pdf.c
trunk/drivers/qt.cpp
trunk/drivers/svg.c
trunk/drivers/tk.c
trunk/drivers/tkwin.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.cpp
trunk/drivers/wxwidgets_agg.cpp
trunk/drivers/wxwidgets_app.cpp
trunk/drivers/wxwidgets_dc.cpp
trunk/drivers/wxwidgets_gc.cpp
trunk/examples/c++/x08.cc
trunk/examples/c++/x09.cc
trunk/examples/c++/x11.cc
trunk/examples/c++/x12.cc
trunk/examples/c++/x14.cc
trunk/examples/c++/x15.cc
trunk/examples/c++/x16.cc
trunk/examples/c++/x17.cc
trunk/examples/c++/x18.cc
trunk/examples/c++/x20.cc
trunk/examples/c++/x21.cc
trunk/examples/c++/x23.cc
trunk/examples/d/x16d.d
trunk/examples/tk/xtk01.c
trunk/examples/tk/xtk02.c
trunk/examples/tk/xtk04.c
trunk/include/dirent_msvc.h
trunk/include/pdf.h
trunk/include/qt.h
trunk/lib/csa/csa.c
trunk/lib/csa/nan.h
trunk/lib/nistcd/cd.c
trunk/lib/nn/hash.c
trunk/lib/nn/nan.h
trunk/lib/nn/nnpi.c
trunk/scripts/style_source.sh
trunk/src/ltdl_win32.c
trunk/src/plargs.c
trunk/src/plcore.c
trunk/src/plot3d.c
trunk/uncrustify.cfg
Modified: trunk/bindings/c++/plstream.h
===================================================================
--- trunk/bindings/c++/plstream.h 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/c++/plstream.h 2011-06-01 19:29:11 UTC (rev 11760)
@@ -86,7 +86,7 @@
//--------------------------------------------------------------------------
class PLDLLIMPEXP_CXX plstream {
- PLINT stream;
+ PLINT stream;
static PLINT active_streams;
@@ -105,9 +105,9 @@
plstream( PLS::stream_id sid, PLINT strm = 0 );
plstream( PLINT _stream ) : stream( _stream ) {}
plstream( PLINT nx /*=1*/, PLINT ny /*=1*/,
- const char *driver = NULL, const char *file = NULL );
+ const char *driver = NULL, const char *file = NULL );
plstream( PLINT nx /*=1*/, PLINT ny /*=1*/, PLINT r, PLINT g, PLINT b,
- const char *driver = NULL, const char *file = NULL );
+ const char *driver = NULL, const char *file = NULL );
virtual ~plstream();
Modified: trunk/bindings/gnome2/lib/gcw-lib.c
===================================================================
--- trunk/bindings/gnome2/lib/gcw-lib.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/gnome2/lib/gcw-lib.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -90,8 +90,8 @@
#endif
// Retrieve the device width and height
- width = *(PLINT*) g_object_get_data( G_OBJECT( dev->canvas ), "canvas-width" );
- height = *(PLINT*) g_object_get_data( G_OBJECT( dev->canvas ), "canvas-height" );
+ width = *(PLINT *) g_object_get_data( G_OBJECT( dev->canvas ), "canvas-width" );
+ height = *(PLINT *) g_object_get_data( G_OBJECT( dev->canvas ), "canvas-height" );
// Allocate the background color
gdk_colormap_alloc_color( dev->colormap, &( dev->bgcolor ), FALSE, TRUE );
@@ -664,8 +664,8 @@
gtk_window_set_focus( GTK_WINDOW( dev->window ), dev->notebook );
// Retrieve the canvas width and height
- width = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
- height = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
+ width = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
+ height = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
// Size the window
gtk_window_resize( GTK_WINDOW( dev->window ), width * ZOOM100 + 65,
@@ -761,9 +761,9 @@
height += 1;
// Attach the width and height to the canvas
- if ( ( w = (PLINT*) malloc( sizeof ( gint ) ) ) == NULL )
+ if ( ( w = (PLINT *) malloc( sizeof ( gint ) ) ) == NULL )
plwarn( "GCW driver <gcw_set_canvas_size>: Insufficient memory." );
- if ( ( h = (PLINT*) malloc( sizeof ( gint ) ) ) == NULL )
+ if ( ( h = (PLINT *) malloc( sizeof ( gint ) ) ) == NULL )
plwarn( "GCW driver <gcw_set_canvas_size>: Insufficient memory." );
*w = width;
*h = height;
@@ -847,8 +847,8 @@
#endif
// Retrieve the device width and height
- width = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
- height = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
+ width = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
+ height = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
// Get the current magnification
gnome_canvas_c2w( canvas, 1, 0, &curmag, &dum );
Modified: trunk/bindings/gnome2/lib/plplotcanvas.c
===================================================================
--- trunk/bindings/gnome2/lib/plplotcanvas.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/gnome2/lib/plplotcanvas.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -76,8 +76,8 @@
{
parent_class = g_type_class_peek( G_TYPE_OBJECT );
GObjectClass* gobject_class = G_OBJECT_CLASS( klass );
- gobject_class->dispose = (void*) plplot_canvas_dispose;
- gobject_class->finalize = (void*) plplot_canvas_finalize;
+ gobject_class->dispose = (void *) plplot_canvas_dispose;
+ gobject_class->finalize = (void *) plplot_canvas_finalize;
}
void plplot_canvas_devinit( PlplotCanvas *self )
@@ -90,9 +90,9 @@
//
plsc->hack = 1;
- plsdev( "gcw" ); // Set the device
- plinit(); // Initialize the device
- plP_esc( PLESC_DEVINIT, (void*) self ); // Install into the driver
+ plsdev( "gcw" ); // Set the device
+ plinit(); // Initialize the device
+ plP_esc( PLESC_DEVINIT, (void *) self ); // Install into the driver
}
GType plplot_canvas_get_type()
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/java/plplotjavac.i 2011-06-01 19:29:11 UTC (rev 11760)
@@ -591,7 +591,7 @@
// some really twisted stuff to allow calling a single precision library from python
PyArrayObject* myArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims )
{
- PyArrayObject* tmp = (PyArrayObject*) PyArray_ContiguousFromObject( in, PyArray_FLOAT,
+ PyArrayObject* tmp = (PyArrayObject *) PyArray_ContiguousFromObject( in, PyArray_FLOAT,
mindims, maxdims );
if ( !tmp )
{
@@ -599,7 +599,7 @@
if ( PyArray_Check( in ) )
{
PyErr_Clear();
- tmp = (PyArrayObject*) PyArray_Cast( (PyArrayObject*) in, PyArray_FLOAT );
+ tmp = (PyArrayObject *) PyArray_Cast( (PyArrayObject *) in, PyArray_FLOAT );
}
}
return tmp;
Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/lua/plplotluac.i 2011-06-01 19:29:11 UTC (rev 11760)
@@ -129,7 +129,7 @@
// With preceding count
%typemap( in ) ( PLINT n, const PLINT * Array )
{
- $2 = (PLINT*) LUA_get_int_num_array_var( L, $input, &$1 );
+ $2 = (PLINT *) LUA_get_int_num_array_var( L, $input, &$1 );
if ( !$2 )
SWIG_fail;
Alen = $1;
@@ -143,7 +143,7 @@
// Trailing count and check consistency with previous
%typemap( in ) ( const PLINT * ArrayCk, PLINT n ) ( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -162,7 +162,7 @@
// No count but check consistency with previous
%typemap( in ) const PLINT * ArrayCk( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -176,7 +176,7 @@
// No count but check consistency with previous, or NULL
%typemap( in ) const PLINT * ArrayCkNull( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -191,7 +191,7 @@
// Weird case to allow argument to be one shorter than others
%typemap( in ) const PLINT * ArrayCkMinus1( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp < Alen - 1 )
@@ -204,7 +204,7 @@
%typemap( in ) const PLINT * ArrayCkMinus1Null( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp < Alen - 1 )
@@ -220,7 +220,7 @@
// No length but remember size to check others
%typemap( in ) const PLINT * Array( int temp )
{
- $1 = (PLINT*) LUA_get_int_num_array_var( L, $input, &temp );
+ $1 = (PLINT *) LUA_get_int_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
Alen = temp;
@@ -239,7 +239,7 @@
%typemap( in ) ( PLINT n, const PLFLT * Array )
{
int temp;
- $2 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $2 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$2 )
SWIG_fail;
$1 = Alen = temp;
@@ -254,7 +254,7 @@
%typemap( in ) ( const PLFLT * ArrayCk, PLINT n )
{
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -273,7 +273,7 @@
// no count, but check consistency with previous
%typemap( in ) const PLFLT * ArrayCk( int temp )
{
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -288,7 +288,7 @@
// no count, but check consistency with previous, or NULL
%typemap( in ) const PLFLT * ArrayCkNull( int temp )
{
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Alen )
@@ -303,7 +303,7 @@
// No length but remember size to check others
%typemap( in ) const PLFLT * Array {
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
Alen = temp;
@@ -318,7 +318,7 @@
%typemap( in ) ( const PLFLT * Array, PLINT n )
{
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
$2 = Alen = temp;
@@ -332,7 +332,7 @@
// check consistency with X dimension of previous
%typemap( in ) const PLFLT * ArrayCkX {
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Xlen )
@@ -347,7 +347,7 @@
// check consistency with Y dimension of previous
%typemap( in ) const PLFLT * ArrayCkY {
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
if ( temp != Ylen )
@@ -363,7 +363,7 @@
%typemap( in ) ( const PLFLT * ArrayX, PLINT nx )
{
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
$2 = Xlen = temp;
@@ -377,7 +377,7 @@
// set X length for later consistency checking
%typemap( in ) const PLFLT * ArrayX {
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
Xlen = temp;
@@ -389,7 +389,7 @@
%typemap( in ) ( const PLFLT * ArrayY, PLINT ny )
{
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
$2 = Ylen = temp;
@@ -403,7 +403,7 @@
// set Y length for later consistency checking
%typemap( in ) const PLFLT * ArrayY {
int temp;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
Ylen = temp;
@@ -611,7 +611,7 @@
{
int temp, i;
- $1 = (PLFLT*) LUA_get_double_num_array_var( L, $input, &temp );
+ $1 = (PLFLT *) LUA_get_double_num_array_var( L, $input, &temp );
if ( !$1 )
SWIG_fail;
$2 = Ylen = temp;
@@ -675,7 +675,7 @@
}
%typemap( in, checkfn = "lua_isstring" ) const char *message {
- $1 = (char*) lua_tostring( L, $input );
+ $1 = (char *) lua_tostring( L, $input );
}
@@ -721,7 +721,7 @@
fprintf( stderr, "function `%s' must return a table as 2nd result", mapform_funcstr );
return;
}
- xtemp = (PLFLT*) LUA_get_double_num_array_var( myL, -2, &len );
+ xtemp = (PLFLT *) LUA_get_double_num_array_var( myL, -2, &len );
if ( !xtemp || len != n )
{
fprintf( stderr, "function `%s' must return a table of length%d", mapform_funcstr, n );
@@ -731,7 +731,7 @@
x[i] = xtemp[i];
LUA_FREE_ARRAY( xtemp );
- ytemp = (PLFLT*) LUA_get_double_num_array_var( myL, -1, &len );
+ ytemp = (PLFLT *) LUA_get_double_num_array_var( myL, -1, &len );
if ( !ytemp || len != n )
{
fprintf( stderr, "function `%s' must return a table of length%d", mapform_funcstr, n );
@@ -1036,7 +1036,7 @@
lua_pop( L, 1 ); // pop test element
if ( gridmode == 1 )
{
- cgrid1.xg = (PLFLT*) LUA_get_double_num_array_var( L, -1, &nx );
+ cgrid1.xg = (PLFLT *) LUA_get_double_num_array_var( L, -1, &nx );
if ( !cgrid1.xg )
{
lua_pop( L, 1 ); // pop "xg"
@@ -1100,7 +1100,7 @@
lua_pop( L, 1 ); // pop "1"
if ( gridmode == 1 )
{
- cgrid1.yg = (PLFLT*) LUA_get_double_num_array_var( L, -1, &ny );
+ cgrid1.yg = (PLFLT *) LUA_get_double_num_array_var( L, -1, &ny );
if ( !cgrid1.yg )
{
lua_pop( L, 1 ); // pop "yg"
@@ -1186,7 +1186,7 @@
lua_rawgeti( L, $input, i );
if ( lua_isstring( L, -1 ) )
{
- $1[i - 1] = (char*) lua_tostring( L, -1 );
+ $1[i - 1] = (char *) lua_tostring( L, -1 );
}
else
{
@@ -1221,7 +1221,7 @@
lua_rawgeti( L, $input, i );
if ( lua_isstring( L, -1 ) )
{
- $1[i - 1] = (char*) lua_tostring( L, -1 );
+ $1[i - 1] = (char *) lua_tostring( L, -1 );
}
else
{
@@ -1271,7 +1271,7 @@
lua_rawgeti( L, $input, i );
if ( lua_isstring( L, -1 ) )
{
- $2[i] = (char*) lua_tostring( L, -1 );
+ $2[i] = (char *) lua_tostring( L, -1 );
}
else
{
Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/ocaml/plplot_impl.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -391,7 +391,7 @@
else
{
c_plcont( f, nx, ny, kx, lx, ky, ly, clevel, nlevel,
- get_ml_plotter_func(), (void*) 1 );
+ get_ml_plotter_func(), (void *) 1 );
}
}
@@ -421,7 +421,7 @@
shade_min, shade_max,
sh_cmap, sh_color, sh_width, min_color, min_width,
max_color, max_width, plfill, rectangular,
- get_ml_plotter_func(), (void*) 1 );
+ get_ml_plotter_func(), (void *) 1 );
}
//
@@ -460,7 +460,7 @@
cont_color, cont_width,
plfill, rectangular,
get_ml_plotter_func(),
- (void*) 1 );
+ (void *) 1 );
}
//
@@ -481,7 +481,7 @@
zmin, zmax,
valuemin, valuemax,
get_ml_plotter_func(),
- (void*) 1 );
+ (void *) 1 );
}
//
@@ -494,7 +494,7 @@
{
c_plvect( u, v, nx, ny, scale,
get_ml_plotter_func(),
- (void*) 1 );
+ (void *) 1 );
}
//
@@ -566,8 +566,8 @@
// Using "type + 1" because "type" is passed in as a variant type, so
// the indexing starts from 0 rather than 1.
- c_plgriddata( (double*) x, (double*) y, (double*) z, npts, (double*) xg, nptsx,
- (double*) yg, nptsy, zg_local, Int_val( type ) + 1,
+ c_plgriddata( (double *) x, (double *) y, (double *) z, npts, (double *) xg, nptsx,
+ (double *) yg, nptsy, zg_local, Int_val( type ) + 1,
Double_val( data ) );
// Allocate the X-dimension of the to-be-returned OCaml array
@@ -878,8 +878,8 @@
double tx;
double ty;
PLcGrid grid;
- grid.xg = (double*) xg;
- grid.yg = (double*) yg;
+ grid.xg = (double *) xg;
+ grid.yg = (double *) yg;
grid.nx = Wosize_val( xg ) / Double_wosize;
grid.ny = Wosize_val( yg ) / Double_wosize;
pltr1( Double_val( x ), Double_val( y ), &tx, &ty, ( PLPointer ) & grid );
@@ -914,12 +914,12 @@
c_xg = malloc( length1 * sizeof ( double* ) );
for ( i = 0; i < length1; i++ )
{
- c_xg[i] = (double*) Field( xg, i );
+ c_xg[i] = (double *) Field( xg, i );
}
c_yg = malloc( length1 * sizeof ( double* ) );
for ( i = 0; i < length1; i++ )
{
- c_yg[i] = (double*) Field( yg, i );
+ c_yg[i] = (double *) Field( yg, i );
}
grid.xg = c_xg;
grid.yg = c_yg;
Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/octave/plplot_octave.i 2011-06-01 19:29:11 UTC (rev 11760)
@@ -1572,7 +1572,7 @@
// if that element is going to be unused).
// leave room for null termination.
max_length = 1;
- tmp_cstring = (char*) "";
+ tmp_cstring = (char *) "";
}
}
else
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/python/plplotcmodule.i 2011-06-01 19:29:11 UTC (rev 11760)
@@ -128,7 +128,7 @@
// some really twisted stuff to allow calling a single precision library from python
PyArrayObject* myIntArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims )
{
- PyArrayObject* tmp = (PyArrayObject*) PyArray_ContiguousFromObject( in, PyArray_PLINT,
+ PyArrayObject* tmp = (PyArrayObject *) PyArray_ContiguousFromObject( in, PyArray_PLINT,
mindims, maxdims );
if ( !tmp )
{
@@ -136,7 +136,7 @@
if ( PyArray_Check( in ) )
{
PyErr_Clear();
- tmp = (PyArrayObject*) PyArray_Cast( (PyArrayObject*) in, PyArray_PLINT );
+ tmp = (PyArrayObject *) PyArray_Cast( (PyArrayObject *) in, PyArray_PLINT );
}
}
return tmp;
@@ -156,7 +156,7 @@
if ( tmp == NULL )
return NULL;
$1 = Alen = tmp->dimensions[0];
- $2 = (PLINT*) tmp->data;
+ $2 = (PLINT *) tmp->data;
}
%typemap( freearg ) ( PLINT n, const PLINT * Array )
{
@@ -175,7 +175,7 @@
return NULL;
}
$2 = tmp->dimensions[0];
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) ( const PLINT * ArrayCk, PLINT n )
{
@@ -193,7 +193,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) const PLINT * ArrayCk { Py_DECREF( tmp$argnum );}
@@ -208,7 +208,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) const PLINT * ArrayCkNull { Py_DECREF( tmp$argnum );}
@@ -223,7 +223,7 @@
PyErr_SetString( PyExc_ValueError, "Vector must be at least length of others minus 1." );
return NULL;
}
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) const PLINT * ArrayCkMinus1 { Py_DECREF( tmp$argnum );}
@@ -237,7 +237,7 @@
PyErr_SetString( PyExc_ValueError, "Vector must be at least length of others minus 1." );
return NULL;
}
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) const PLINT * ArrayCkMinus1Null { Py_DECREF( tmp$argnum );}
@@ -248,7 +248,7 @@
if ( tmp == NULL )
return NULL;
Alen = tmp->dimensions[0];
- $1 = (PLINT*) tmp->data;
+ $1 = (PLINT *) tmp->data;
}
%typemap( freearg ) const PLINT * Array { Py_DECREF( tmp$argnum );}
@@ -262,7 +262,7 @@
// some really twisted stuff to allow calling a single precision library from python
PyArrayObject* myArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims )
{
- PyArrayObject* tmp = (PyArrayObject*) PyArray_ContiguousFromObject( in, PyArray_FLOAT,
+ PyArrayObject* tmp = (PyArrayObject *) PyArray_ContiguousFromObject( in, PyArray_FLOAT,
mindims, maxdims );
if ( !tmp )
{
@@ -270,7 +270,7 @@
if ( PyArray_Check( in ) )
{
PyErr_Clear();
- tmp = (PyArrayObject*) PyArray_Cast( (PyArrayObject*) in, PyArray_FLOAT );
+ tmp = (PyArrayObject *) PyArray_Cast( (PyArrayObject *) in, PyArray_FLOAT );
}
}
return tmp;
@@ -290,7 +290,7 @@
if ( tmp == NULL )
return NULL;
$1 = Alen = tmp->dimensions[0];
- $2 = (PLFLT*) tmp->data;
+ $2 = (PLFLT *) tmp->data;
}
%typemap( freearg ) ( PLINT n, const PLFLT * Array )
{
@@ -308,7 +308,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
$2 = tmp->dimensions[0];
}
%typemap( freearg ) ( const PLFLT * ArrayCk, PLINT n )
@@ -327,7 +327,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayCk { Py_DECREF( tmp$argnum );}
@@ -342,7 +342,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayCkNull { Py_DECREF( tmp$argnum );}
@@ -357,7 +357,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayCkX { Py_DECREF( tmp$argnum );}
@@ -372,7 +372,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayCkY { Py_DECREF( tmp$argnum );}
@@ -384,7 +384,7 @@
return NULL;
Xlen = tmp->dimensions[0];
$2 = Xlen;
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) ( const PLFLT * ArrayX, PLINT nx )
{
@@ -398,7 +398,7 @@
if ( tmp == NULL )
return NULL;
Xlen = tmp->dimensions[0];
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayX { Py_DECREF( tmp$argnum );}
@@ -410,7 +410,7 @@
return NULL;
Ylen = tmp->dimensions[0];
$2 = Ylen;
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) ( const PLFLT * ArrayY, PLINT ny )
{
@@ -424,7 +424,7 @@
if ( tmp == NULL )
return NULL;
Ylen = tmp->dimensions[0];
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * ArrayY { Py_DECREF( tmp$argnum );}
@@ -436,7 +436,7 @@
if ( tmp == NULL )
return NULL;
$2 = tmp->dimensions[0];
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) ( const PLFLT * Array, PLINT n )
{
@@ -450,7 +450,7 @@
if ( tmp == NULL )
return NULL;
Alen = tmp->dimensions[0];
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) const PLFLT * Array { Py_DECREF( tmp$argnum );}
@@ -469,9 +469,9 @@
$2 = tmp->dimensions[0];
$3 = tmp->dimensions[1];
size = sizeof ( PLFLT ) * $3;
- $1 = (PLFLT**) malloc( sizeof ( PLFLT* ) * $2 );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * $2 );
for ( i = 0; i < $2; i++ )
- $1[i] = (PLFLT*) ( tmp->data + i * size );
+ $1[i] = (PLFLT *) ( tmp->data + i * size );
}
%typemap( freearg ) ( const PLFLT * *MatrixCk, PLINT nx, PLINT ny )
{
@@ -489,9 +489,9 @@
Xlen = $2 = tmp->dimensions[0];
Ylen = $3 = tmp->dimensions[1];
size = sizeof ( PLFLT ) * $3;
- $1 = (PLFLT**) malloc( sizeof ( PLFLT* ) * $2 );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * $2 );
for ( i = 0; i < $2; i++ )
- $1[i] = (PLFLT*) ( tmp->data + i * size );
+ $1[i] = (PLFLT *) ( tmp->data + i * size );
}
%typemap( freearg ) ( const PLFLT * *Matrix, PLINT nx, PLINT ny )
{
@@ -509,9 +509,9 @@
Xlen = tmp->dimensions[0];
Ylen = tmp->dimensions[1];
size = sizeof ( PLFLT ) * Ylen;
- $1 = (PLFLT**) malloc( sizeof ( PLFLT* ) * Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT*) ( tmp->data + i * size );
+ $1[i] = (PLFLT *) ( tmp->data + i * size );
}
%typemap( freearg ) const PLFLT * *Matrix {
Py_DECREF( tmp$argnum );
@@ -526,7 +526,7 @@
return NULL;
Xlen = $2 = tmp->dimensions[0];
Ylen = $3 = tmp->dimensions[1];
- $1 = (PLFLT*) tmp->data;
+ $1 = (PLFLT *) tmp->data;
}
%typemap( freearg ) ( const PLFLT * Matrix, PLINT nx, PLINT ny )
{
@@ -546,9 +546,9 @@
return NULL;
}
size = sizeof ( PLFLT ) * Ylen;
- $1 = (PLFLT**) malloc( sizeof ( PLFLT* ) * Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT*) ( tmp->data + i * size );
+ $1[i] = (PLFLT *) ( tmp->data + i * size );
}
%typemap( freearg ) const PLFLT * *MatrixCk {
Py_DECREF( tmp$argnum );
@@ -568,9 +568,9 @@
return NULL;
}
size = sizeof ( PLFLT ) * Ylen;
- $1 = (PLFLT**) malloc( sizeof ( PLFLT* ) * Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT*) ( tmp->data + i * size );
+ $1[i] = (PLFLT *) ( tmp->data + i * size );
}
%typemap( freearg ) PLFLT * *OutMatrixCk {
Py_DECREF( tmp$argnum );
@@ -657,9 +657,9 @@
PyErr_SetString( PyExc_ValueError, "Expected a sequence of two arrays." );
return NULL;
}
- pltr_xg = (PyArrayObject*) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 0 ),
+ pltr_xg = (PyArrayObject *) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 0 ),
PyArray_PLFLT, 1, 1 );
- pltr_yg = (PyArrayObject*) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 1 ),
+ pltr_yg = (PyArrayObject *) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 1 ),
PyArray_PLFLT, 1, 1 );
if ( pltr_xg == 0 || pltr_yg == 0 )
{
@@ -684,8 +684,8 @@
return NULL;
}
}
- tmpGrid1.xg = (PLFLT*) pltr_xg->data;
- tmpGrid1.yg = (PLFLT*) pltr_yg->data;
+ tmpGrid1.xg = (PLFLT *) pltr_xg->data;
+ tmpGrid1.yg = (PLFLT *) pltr_yg->data;
return &tmpGrid1;
}
@@ -705,9 +705,9 @@
PyErr_SetString( PyExc_ValueError, "Expected a sequence of two arrays." );
return NULL;
}
- pltr_xg = (PyArrayObject*) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 0 ),
+ pltr_xg = (PyArrayObject *) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 0 ),
PyArray_PLFLT, 2, 2 );
- pltr_yg = (PyArrayObject*) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 1 ),
+ pltr_yg = (PyArrayObject *) myArray_ContiguousFromObject( PySequence_Fast_GET_ITEM( input, 1 ),
PyArray_PLFLT, 2, 2 );
if ( pltr_xg == 0 || pltr_yg == 0 )
{
@@ -739,12 +739,12 @@
}
}
size = sizeof ( PLFLT ) * tmpGrid2.ny;
- tmpGrid2.xg = (PLFLT**) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
+ tmpGrid2.xg = (PLFLT **) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
- tmpGrid2.xg[i] = (PLFLT*) ( pltr_xg->data + i * size );
- tmpGrid2.yg = (PLFLT**) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
+ tmpGrid2.xg[i] = (PLFLT *) ( pltr_xg->data + i * size );
+ tmpGrid2.yg = (PLFLT **) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
- tmpGrid2.yg[i] = (PLFLT*) ( pltr_yg->data + i * size );
+ tmpGrid2.yg[i] = (PLFLT *) ( pltr_yg->data + i * size );
return &tmpGrid2;
}
@@ -858,7 +858,7 @@
PyArrayObject *tmp;
// the data argument is acutally a pointer to a python object
- pdata = (PyObject*) data;
+ pdata = (PyObject *) data;
if ( data == NULL )
{
pdata = Py_None;
@@ -902,7 +902,7 @@
}
else
{
- PLFLT* t = (PLFLT*) tmp->data;
+ PLFLT* t = (PLFLT *) tmp->data;
*tx = t[0];
*ty = t[1];
Py_XDECREF( tmp );
@@ -921,7 +921,7 @@
PLFLT fresult = 0.0;
// the data argument is acutally a pointer to a python object
- pdata = (PyObject*) data;
+ pdata = (PyObject *) data;
if ( python_f2eval ) // if not something is terribly wrong
{ // hold a reference to the data object
Py_XINCREF( pdata );
@@ -960,7 +960,7 @@
// the data argument is acutally a pointer to a python object
if ( data )
- pdata = (PyObject*) data;
+ pdata = (PyObject *) data;
else
pdata = Py_None;
if ( python_label ) // if not something is terribly wrong
@@ -1013,7 +1013,7 @@
n = 1;
// the data argument is acutally a pointer to a python object
- pdata = (PyObject*) data;
+ pdata = (PyObject *) data;
if ( data == NULL )
{
pdata = Py_None;
@@ -1190,7 +1190,7 @@
break;
case CB_Python:
Py_XINCREF( input );
- result = (PLPointer*) input;
+ result = (PLPointer *) input;
break;
default:
fprintf( stderr, "pltr_type is invalid\n" );
@@ -1231,7 +1231,7 @@
}
else
{
- if ( !PyCallable_Check( (PyObject*) $input ) )
+ if ( !PyCallable_Check( (PyObject *) $input ) )
{
PyErr_SetString( PyExc_ValueError, "pltr argument must be callable" );
return NULL;
@@ -1259,7 +1259,7 @@
}
else
{
- if ( !PyCallable_Check( (PyObject*) $input ) )
+ if ( !PyCallable_Check( (PyObject *) $input ) )
{
PyErr_SetString( PyExc_ValueError, "coordinate transform argument must be callable" );
return NULL;
@@ -1282,7 +1282,7 @@
}
else
{
- if ( !PyCallable_Check( (PyObject*) $input ) )
+ if ( !PyCallable_Check( (PyObject *) $input ) )
{
PyErr_SetString( PyExc_ValueError, "mapform argument must be callable" );
return NULL;
@@ -1345,14 +1345,14 @@
}
else
{
- if ( !PyCallable_Check( (PyObject*) $input ) )
+ if ( !PyCallable_Check( (PyObject *) $input ) )
{
PyErr_SetString( PyExc_ValueError, "pltr argument must be callable" );
return NULL;
}
// hold a reference to it
- Py_XINCREF( (PyObject*) $input );
- python_f2eval = (PyObject*) $input;
+ Py_XINCREF( (PyObject *) $input );
+ python_f2eval = (PyObject *) $input;
// this function handles calling the python function
$1 = do_f2eval_callback;
}
@@ -1376,14 +1376,14 @@
}
else
{
- if ( !PyCallable_Check( (PyObject*) $input ) )
+ if ( !PyCallable_Check( (PyObject *) $input ) )
{
PyErr_SetString( PyExc_ValueError, "label_func argument must be callable" );
return NULL;
}
// hold a reference to it
- Py_XINCREF( (PyObject*) $input );
- python_label = (PyObject*) $input;
+ Py_XINCREF( (PyObject *) $input );
+ python_label = (PyObject *) $input;
// this function handles calling the python function
$1 = do_label_callback;
}
Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/qt_gui/plqt.cpp 2011-06-01 19:29:11 UTC (rev 11760)
@@ -304,7 +304,7 @@
case '#':
- currentString.append( QString( (QChar*) &( text[i] ), 1 ) );
+ currentString.append( QString( (QChar *) &( text[i] ), 1 ) );
break;
default:
@@ -1503,20 +1503,20 @@
void plsetqtdev( QtExtWidget* widget )
{
- plsc->dev = (void*) widget;
+ plsc->dev = (void *) widget;
widget->setPLStream( plsc );
}
void plsetqtdev( QtExtWidget* widget, int argc, char** argv )
{
- plparseopts( &argc, (const char**) argv, PL_PARSE_FULL );
- plsc->dev = (void*) widget;
+ plparseopts( &argc, (const char **) argv, PL_PARSE_FULL );
+ plsc->dev = (void *) widget;
widget->setPLStream( plsc );
}
void plfreeqtdev()
{
- delete ( (QtExtWidget*) plsc->dev );
+ delete ( (QtExtWidget *) plsc->dev );
plsc->dev = NULL;
}
#endif
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tcl/tclAPI.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -470,7 +470,7 @@
Tcl_ResetResult( interp );
}
else
- libDir = (char*) Tcl_GetVar( interp, "pllibrary", TCL_GLOBAL_ONLY );
+ libDir = (char *) Tcl_GetVar( interp, "pllibrary", TCL_GLOBAL_ONLY );
}
#ifdef TCL_DIR
@@ -555,7 +555,7 @@
// Can be used with either Tcl-DP or TK
Tcl_CreateCommand( interp, "wait_until", (Tcl_CmdProc *) plWait_Until,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
return TCL_OK;
}
@@ -591,7 +591,7 @@
for ( cmdInfoPtr = Cmds; cmdInfoPtr->name != NULL; cmdInfoPtr++ )
{
Tcl_CreateCommand( interp, cmdInfoPtr->name, cmdInfoPtr->proc,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
}
// Define the flags as variables in the PLPLOT namespace
Modified: trunk/bindings/tcl/tclMatrix.c
===================================================================
--- trunk/bindings/tcl/tclMatrix.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tcl/tclMatrix.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -319,7 +319,7 @@
}
matPtr->tracing = 1;
Tcl_TraceVar( interp, matPtr->name, TCL_TRACE_UNSETS,
- (Tcl_VarTraceProc*) DeleteMatrixVar, (ClientData) matPtr );
+ (Tcl_VarTraceProc *) DeleteMatrixVar, (ClientData) matPtr );
}
// Create matrix operator
@@ -327,8 +327,8 @@
#ifdef DEBUG
fprintf( stderr, "Creating Matrix operator of name %s\n", matPtr->name );
#endif
- Tcl_CreateCommand( interp, matPtr->name, (Tcl_CmdProc*) MatrixCmd,
- (ClientData) matPtr, (Tcl_CmdDeleteProc*) DeleteMatrixCmd );
+ Tcl_CreateCommand( interp, matPtr->name, (Tcl_CmdProc *) MatrixCmd,
+ (ClientData) matPtr, (Tcl_CmdDeleteProc *) DeleteMatrixCmd );
// Store pointer to interpreter to handle bizarre uses of multiple
// interpreters (e.g. as in [incr Tcl])
Modified: trunk/bindings/tk/Pltk_Init.c
===================================================================
--- trunk/bindings/tk/Pltk_Init.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk/Pltk_Init.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -70,14 +70,14 @@
// plframe -- PLplot graphing widget
- Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc*) plFrameCmd,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc *) plFrameCmd,
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
// host_id -- returns host IP number. Only for use with Tcl-DP
#ifdef PLD_dp
- Tcl_CreateCommand( interp, "host_id", (Tcl_CmdProc*) plHost_ID,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "host_id", (Tcl_CmdProc *) plHost_ID,
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
#endif
// Set up auto_path
Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk/plframe.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -455,7 +455,7 @@
plFramePtr->devName[i] = NULL;
}
ndev = NDEV;
- plgFileDevs( (const char***) &plFramePtr->devDesc, (const char ***) &plFramePtr->devName, &ndev );
+ plgFileDevs( (const char ***) &plFramePtr->devDesc, (const char ***) &plFramePtr->devName, &ndev );
// Start up event handlers and other good stuff
@@ -471,7 +471,7 @@
plFramePtr->widgetCmd =
#endif
Tcl_CreateCommand( interp, Tk_PathName( plFramePtr->tkwin ),
- (Tcl_CmdProc*) PlFrameWidgetCmd, (ClientData) plFramePtr, (Tcl_CmdDeleteProc*) NULL );
+ (Tcl_CmdProc *) PlFrameWidgetCmd, (ClientData) plFramePtr, (Tcl_CmdDeleteProc *) NULL );
#ifdef HAVE_ITCL
Itk_SetWidgetCommand( plFramePtr->tkwin, plFramePtr->widgetCmd );
#endif
@@ -2253,7 +2253,7 @@
dbug_enter( "ConfigurePlFrame" );
if ( Tk_ConfigureWidget( interp, tkwin, configSpecs,
- argc, (CONST char**) argv, (char *) plFramePtr, flags ) != TCL_OK )
+ argc, (CONST char **) argv, (char *) plFramePtr, flags ) != TCL_OK )
{
return TCL_ERROR;
}
Modified: trunk/bindings/tk/plserver.c
===================================================================
--- trunk/bindings/tk/plserver.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk/plserver.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -233,7 +233,7 @@
tcl_cmd( interp, "rename exit tkexit" );
Tcl_CreateCommand( interp, "exit", (Tcl_CmdProc *) plExitCmd,
- (ClientData) mainWindow, (Tcl_CmdDeleteProc*) NULL );
+ (ClientData) mainWindow, (Tcl_CmdDeleteProc *) NULL );
// Define the flags as variables in the PLPLOT namespace
Modified: trunk/bindings/tk/tkshell.c
===================================================================
--- trunk/bindings/tk/tkshell.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk/tkshell.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -44,25 +44,25 @@
// plframe -- PLplot graphing widget
- Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc*) plFrameCmd,
- (ClientData) main, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc *) plFrameCmd,
+ (ClientData) main, (Tcl_CmdDeleteProc *) NULL );
// matrix -- matrix support command
- Tcl_CreateCommand( interp, "matrix", (Tcl_CmdProc*) Tcl_MatrixCmd,
- (ClientData) main, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "matrix", (Tcl_CmdProc *) Tcl_MatrixCmd,
+ (ClientData) main, (Tcl_CmdDeleteProc *) NULL );
// wait_until -- waits for a specific condition to arise
// Can be used with either Tcl-DP or TK
- Tcl_CreateCommand( interp, "wait_until", (Tcl_CmdProc*) plWait_Until,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "wait_until", (Tcl_CmdProc *) plWait_Until,
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
// host_id -- returns host IP number. Only for use with Tcl-DP
#ifdef PLD_dp
- Tcl_CreateCommand( interp, "host_id", (Tcl_CmdProc*) plHost_ID,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "host_id", (Tcl_CmdProc *) plHost_ID,
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
#endif
// Set up auto_path
Modified: trunk/bindings/tk-x-plat/Plplotter_Init.c
===================================================================
--- trunk/bindings/tk-x-plat/Plplotter_Init.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk-x-plat/Plplotter_Init.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -87,8 +87,8 @@
// plframe -- PLplot graphing widget
- Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc*) plPlotterCmd,
- (ClientData) NULL, (Tcl_CmdDeleteProc*) NULL );
+ Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc *) plPlotterCmd,
+ (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
Tcl_PkgProvide( interp, "Plplotter", VERSION );
return TCL_OK;
Modified: trunk/bindings/tk-x-plat/plplotter.c
===================================================================
--- trunk/bindings/tk-x-plat/plplotter.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/tk-x-plat/plplotter.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -377,8 +377,8 @@
plPlotterPtr->interp = interp;
plPlotterPtr->widgetCmd =
Tcl_CreateCommand( interp, Tk_PathName( plPlotterPtr->tkwin ),
- (Tcl_CmdProc*) PlPlotterWidgetCmd, (ClientData) plPlotterPtr,
- (Tcl_CmdDeleteProc*) NULL );
+ (Tcl_CmdProc *) PlPlotterWidgetCmd, (ClientData) plPlotterPtr,
+ (Tcl_CmdDeleteProc *) NULL );
plPlotterPtr->xorGC = NULL;
plPlotterPtr->border = NULL;
plPlotterPtr->cursor = None;
@@ -454,7 +454,7 @@
// for active plot
ActiveState( plPlotterPtr, 1 );
- if ( ConfigurePlPlotter( interp, plPlotterPtr, argc - 2, (CONST char**) argv + 2, 0 ) != TCL_OK )
+ if ( ConfigurePlPlotter( interp, plPlotterPtr, argc - 2, (CONST char **) argv + 2, 0 ) != TCL_OK )
{
Tk_DestroyWindow( plPlotterPtr->tkwin );
return TCL_ERROR;
@@ -905,7 +905,7 @@
{
Tcl_CancelIdleCall( DisplayPlPlotter, (ClientData) plPlotterPtr );
}
- Tk_EventuallyFree( (ClientData) plPlotterPtr, (Tcl_FreeProc*) DestroyPlPlotter );
+ Tk_EventuallyFree( (ClientData) plPlotterPtr, (Tcl_FreeProc *) DestroyPlPlotter );
break;
case MapNotify:
Modified: trunk/bindings/wxwidgets/wxPLplotstream.cpp
===================================================================
--- trunk/bindings/wxwidgets/wxPLplotstream.cpp 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/wxwidgets/wxPLplotstream.cpp 2011-06-01 19:29:11 UTC (rev 11760)
@@ -90,10 +90,10 @@
if ( m_backend == wxPLPLOT_BACKEND_AGG )
{
m_image = new wxImage( m_width, m_height );
- cmd( PLESC_DEVINIT, (void*) m_image );
+ cmd( PLESC_DEVINIT, (void *) m_image );
}
else
- cmd( PLESC_DEVINIT, (void*) m_dc );
+ cmd( PLESC_DEVINIT, (void *) m_dc );
}
@@ -130,20 +130,20 @@
{
delete m_image;
m_image = new wxImage( width, height );
- cmd( PLESC_DEVINIT, (void*) m_image );
+ cmd( PLESC_DEVINIT, (void *) m_image );
}
wxSize size( width, height );
- cmd( PLESC_RESIZE, (void*) &size );
+ cmd( PLESC_RESIZE, (void *) &size );
}
else
{
wxSize size( width, height );
- cmd( PLESC_RESIZE, (void*) &size );
+ cmd( PLESC_RESIZE, (void *) &size );
if ( m_image )
{
delete m_image;
m_image = new wxImage( width, height );
- cmd( PLESC_DEVINIT, (void*) m_image );
+ cmd( PLESC_DEVINIT, (void *) m_image );
}
}
Modified: trunk/bindings/wxwidgets/wxPLplotwindow.cpp
===================================================================
--- trunk/bindings/wxwidgets/wxPLplotwindow.cpp 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/wxwidgets/wxPLplotwindow.cpp 2011-06-01 19:29:11 UTC (rev 11760)
@@ -59,7 +59,7 @@
MemPlotDCBitmap = new wxBitmap( bitmapWidth, bitmapHeight, -1 );
MemPlotDC->SelectObject( *MemPlotDCBitmap );
- m_stream = new wxPLplotstream( (wxDC*) MemPlotDC, m_width, m_height, pl_style );
+ m_stream = new wxPLplotstream( (wxDC *) MemPlotDC, m_width, m_height, pl_style );
m_stream->cmd( PLESC_GETBACKEND, &m_backend );
m_backend = 1 << ( m_backend + 2 );
Modified: trunk/bindings/wxwidgets/wxPLplotwindow.h
===================================================================
--- trunk/bindings/wxwidgets/wxPLplotwindow.h 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/bindings/wxwidgets/wxPLplotwindow.h 2011-06-01 19:29:11 UTC (rev 11760)
@@ -36,8 +36,8 @@
{
public:
wxPLplotwindow( wxWindow * parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, long style = 0,
- int pl_style = wxPLPLOT_NONE ); //!< Constructor.
+ const wxSize& size = wxDefaultSize, long style = 0,
+ int pl_style = wxPLPLOT_NONE ); //!< Constructor.
~wxPLplotwindow( void ); //!< Deconstructor.
void RenewPlot( void ); //!< Redo plot.
Modified: trunk/drivers/aqt.c
===================================================================
--- trunk/drivers/aqt.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/aqt.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -474,7 +474,7 @@
break;
case PLESC_GETC: // get cursor position
[adapter renderPlot]; // needed to give the user something to click on
- get_cursor( pls, (PLGraphicsIn*) ptr );
+ get_cursor( pls, (PLGraphicsIn *) ptr );
break;
case PLESC_SWIN: // set window parameters
break;
@@ -799,7 +799,7 @@
// printf("new font : %s\n", new_font);
- AQT_FontLookup[i].pfont = (unsigned char*) new_font;
+ AQT_FontLookup[i].pfont = (unsigned char *) new_font;
}
}
}
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/cairo.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -1174,7 +1174,7 @@
{
int bytes_written;
- bytes_written = fwrite( data, 1, length, (FILE*) filePointer );
+ bytes_written = fwrite( data, 1, length, (FILE *) filePointer );
if ( bytes_written == length )
{
return CAIRO_STATUS_SUCCESS;
@@ -1942,7 +1942,7 @@
case PLESC_GETC: // get cursor position
blit_to_x( pls, 0.0, 0.0, pls->xlength, pls->ylength );
XFlush( aStream->XDisplay );
- xcairo_get_cursor( pls, (PLGraphicsIn*) ptr );
+ xcairo_get_cursor( pls, (PLGraphicsIn *) ptr );
break;
case PLESC_DEVINIT: { // Set external drawable
Window rootwin;
@@ -3256,7 +3256,7 @@
InvalidateRect( aStream->hwnd, NULL, TRUE );
break;
case PLESC_GETC:
- handle_locate( pls, (PLGraphicsIn*) ptr );
+ handle_locate( pls, (PLGraphicsIn *) ptr );
break;
default:
plD_esc_cairo( pls, op, ptr );
Modified: trunk/drivers/gcw.c
===================================================================
--- trunk/drivers/gcw.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/gcw.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -360,7 +360,7 @@
if ( dev->use_pixmap && !dev->use_persistence ) // Write to bg pixmap
{
- if ( ( gdkpoints = (GdkPoint*) malloc( npts * sizeof ( GdkPoint ) ) ) == NULL )
+ if ( ( gdkpoints = (GdkPoint *) malloc( npts * sizeof ( GdkPoint ) ) ) == NULL )
{
plabort( "GCW driver <plD_polyline_gcw>: Could not create gdkpoints" );
return;
@@ -531,8 +531,8 @@
group = dev->group_hidden;
// Retrieve the device width and height of the canvas
- width = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
- height = *(PLINT*) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
+ width = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-width" );
+ height = *(PLINT *) g_object_get_data( G_OBJECT( canvas ), "canvas-height" );
if ( dev->pixmap_has_data )
{
@@ -601,7 +601,7 @@
// Destroy the old visible group
if ( GNOME_IS_CANVAS_GROUP( dev->group_visible ) )
{
- gtk_object_destroy( (GtkObject*) ( dev->group_visible ) );
+ gtk_object_destroy( (GtkObject *) ( dev->group_visible ) );
dev->group_visible = NULL;
}
@@ -871,7 +871,7 @@
if ( dev->use_pixmap && !dev->use_persistence ) // Write to a pixmap
{
- if ( ( gdkpoints = (GdkPoint*) malloc( pls->dev_npts * sizeof ( GdkPoint ) ) ) == NULL )
+ if ( ( gdkpoints = (GdkPoint *) malloc( pls->dev_npts * sizeof ( GdkPoint ) ) ) == NULL )
{
plabort( "GCW driver <fill_polygon>: Could not create gdkpoints" );
return;
Modified: trunk/drivers/pbm.c
===================================================================
--- trunk/drivers/pbm.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/pbm.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -277,7 +277,7 @@
plD_bop_pbm( PLStream *pls )
{
int i, j, k;
- cmap = (char*) malloc( pls->xlength * pls->ylength * 3 );
+ cmap = (char *) malloc( pls->xlength * pls->ylength * 3 );
for ( i = 0; i < pls->ylength; i++ )
for ( j = 0; j < pls->xlength; j++ )
{
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/pdf.c 2011-06-01 19:29:11 UTC (rev 11760)
@@ -190,10 +190,10 @@
pdfdev* dev;
// allocate memory for the device storage
- dev = (pdfdev*) calloc( 1, sizeof ( pdfdev ) );
+ dev = (pdfdev *) calloc( 1, sizeof ( pdfdev ) );
if ( dev == NULL )
plexit( "Insufficient memory\n" );
- pls->dev = (void*) dev;
+ pls->dev = (void *) dev;
// Check for and set up driver options
plParseDrvOpts( pdf_options );
@@ -296,7 +296,7 @@
//--------------------------------------------------------------------------
void plD_bop_pdf( PLStream *pls )
{
- pdfdev * dev = (pdfdev*) pls->dev;
+ pdfdev * dev = (pdfdev *) pls->dev;
HPDF_REAL width, height;
pls->page++;
@@ -374,7 +374,7 @@
//--------------------------------------------------------------------------
void plD_tidy_pdf( PLStream *pls )
{
- pdfdev* dev = (pdfdev*) pls->dev;
+ pdfdev* dev = (pdfdev *) pls->dev;
// save the document to a stream
HPDF_SaveToStream( dev->pdf );
@@ -430,7 +430,7 @@
poly_line( pls, pls->dev_x, pls->dev_y, pls->dev_npts, 1 );
break;
case PLESC_HAS_TEXT: // render text
- process_string( pls, (EscText*) ptr );
+ process_string( pls, (EscText *) ptr );
break;
}
}
@@ -443,7 +443,7 @@
//--------------------------------------------------------------------------
void poly_line( PLStream *pls, short *xa, short *ya, PLINT npts, short fill )
{
- pdfdev* dev = (pdfdev*) pls->dev;
+ pdfdev* dev = (pdfdev *) pls->dev;
PLINT i;
HPDF_Page_SetLineWidth( dev->page, (HPDF_REAL) ( pls->width ) );
@@ -531,12 +531,12 @@
HPDF_Page_SetTextRenderingMode( dev->page, HPDF_FILL );
HPDF_Page_SetRGBFill( dev->page, dev->textRed, dev->textGreen, dev->textBlue );
HPDF_Page_MoveTextPos( dev->page, dev->textWidth, dev->yOffset );
- HPDF_Page_ShowText( dev->page, (char*) type1_string ); // TODO: this conversion must be wrong
+ HPDF_Page_ShowText( dev->page, (char *) type1_string ); // TODO: this conversion must be wrong
HPDF_Page_EndText( dev->page );
}
// determine text width and height
- dev->textWidth += HPDF_Page_TextWidth( dev->page, (char*) type1_string ); // TODO: this conversion must be wrong
+ dev->textWidth += HPDF_Page_TextWidth( dev->page, (char *) type1_string ); // TODO: this conversion must be wrong
th = (HPDF_REAL) ( HPDF_Font_GetCapHeight( dev->m_font ) * dev->fontSize * dev->fontScale / 1000.0 );
dev->textHeight = dev->textHeight > ( th + dev->yOffset ) ? dev->textHeight : ( th + dev->yOffset );
@@ -788,7 +788,7 @@
//--------------------------------------------------------------------------
void process_string( PLStream* pls, EscText* args )
{
- pdfdev * dev = (pdfdev*) pls->dev;
+ pdfdev * dev = (pdfdev *) pls->dev;
PLFLT rotation, shear, stride;
HPDF_REAL cos_rot, sin_rot, cos_shear, sin_shear;
Modified: trunk/drivers/qt.cpp
===================================================================
--- trunk/drivers/qt.cpp 2011-06-01 17:41:34 UTC (rev 11759)
+++ trunk/drivers/qt.cpp 2011-06-01 19:29:11 UTC (rev 11760)
@@ -280,8 +280,8 @@
if ( pls->xlength <= 0 || pls->ylength <= 0 )
{
pls->dev = new QtRasterDevice;
- pls->xlength = (PLINT) ( ( (QtRasterDevice*) ( pls->dev ) )->m_dWidth );
- pls->ylength = (PLINT) ( ( (QtRasterDevice*) ( pls->dev ) )->m_dHeight );
+ pls->xlength = (PLINT) ( ( (QtRasterDevice *) ( pls->dev ) )->m_dWidth );
+ pls->ylength = (PLINT) ( ( (QtRasterDevice *) ( pls->dev ) )->m_dHeight );
}
else
{
@@ -290,18 +290,18 @@
( (QtRasterDevice *) pls->dev )->setPLStream( pls );
if ( isMaster )
- handler.setMasterDevice( (QtRasterDevice*) ( pls->dev ) );
+ handler.setMasterDevice( (QtRasterDevice *) ( pls->dev ) );
if ( pls->xlength > pls->ylength )
- ( (QtRasterDevice*) ( pls->dev ) )->downscale = (PLFLT) pls->xlength / (PLFLT) ( PIXELS_X - 1 );
+ ( (QtRasterDevice *) ( pls->dev ) )->downscale = (PLFLT) pls->xlength / (PLFLT) ( PIXELS_X - 1 );
else
- ( (QtRasterDevice*) ( pls->dev ) )->downscale = (PLFLT) pls->ylength / (PLFLT) PIXELS_Y;
+ ( (QtRasterDevice *) ( pls->dev ) )->downscale = (PLFLT) pls->ylength / (PLFLT) PIXELS_Y;
- plP_setphy( (PLINT) 0, (PLINT) ( pls->xlength / ( (QtRasterDevice*) ( pls->dev ) )->downscale ), (PLINT) 0, (PLINT) ( pls->ylength / ( (QtRasterDevice*) ( pls->dev ) )->downscale ) );
+ plP_setphy( (PLINT) 0, (PLINT) ( pls->xlength / ( (QtRasterDevice *) ( pls->dev ) )->downscale ), (PLINT) 0, (PLINT) ( pls->ylength / ( (QtRasterDevice *) ( pls->dev ) )->downscale ) );
- plP_setpxl( dpi / 25.4 / ( (QtRasterDevice*) ( pls->dev ) )->downscale, dpi / 25.4 / ( (QtRasterDevice*) ( pls->dev ) )->downscale );
+ plP_setpxl( dpi / 25.4 / ( (QtRasterDevice *) ( pls->dev ) )->downscale, dpi / 25.4 / ( (QtRasterDevice *) ( pls->dev ) )->downscale );
- ( (QtRasterDevice*) ( pls->dev ) )->setResolution( dpi );
+ ( (QtRasterDevice *) ( pls->dev ) )->setResolution( dpi );
// Initialize family file info
plFamInit( pls );
@@ -321,7 +321,7 @@
void plD_line_rasterqt( PLStream * pls, short x1a, short y1a, short x2a, short y2a )
{
- QtRasterDevice* widget = (QtRasterDevice*) pls->dev;
+ QtRasterDevice* widget = (QtRasterDevice *) pls->dev;
if ( widget != NULL && qt_family_check( pls ) )
{
@@ -448,11 +448,11 @@
break;
case PLSTATE_COLOR0:
- ( (QtPLDriver*) widget )->QtPLDriver::setColor( pls->curcolor.r, pls->curcolor.g, pls->curcolor.b, pls->curcolor.a );
+ ( (QtPLDriver *) widget )->QtPLDriver::setColor( pls->curcolor.r, pls->curcolor.g, pls->curcolor.b, pls->curcolor.a );
break;
case PLSTATE_COLOR1:
- ( (QtPLDriver*) widget )->QtPLDriver::setColor( pls->curcolor.r, pls->curcolor.g, pls->curcolor.b, pls->curcolor.a );
+ ( (QtPLDriver *) widget )->QtPLDriver::setColor( pls->curcolor.r, pls->curcolor.g, pls->curcolor.b, pls->curcolor.a );
break;
@@ -462,7 +462,7 @@
void plD_tidy_rasterqt( PLStream * pls )
{
- QtRasterDevice * widget = (QtRasterDevice*) pls->dev;
+ QtRasterDevice * widget = (QtRasterDevice *) pls->dev;
if ( widget != NULL )
{
@@ -701,8 +701,8 @@
if ( pls->xlength <= 0 || pls->ylength <= 0 )
{
pls->dev = new QtSVGDevice;
- pls->xlength = (int) ( ( (QtSVGDevice*) ( pls->dev ) )->m_dWidth );
- pls->ylength = (int) ( ( (QtSVGDevice*) ( pls->dev ) )->m_dHeight );
+ pls->xlength = (int) ( ( (QtSVGDevice *) ( pls->dev ) )->m_dWidth );
+ pls->ylength = (int) ( ( (QtSVGDevice *) ( pls->dev ) )->m_dHeight );
}
else
{
@@ -711,16 +711,16 @@
( (QtSVGDevice *) pls->dev )->setPLStream( pls );
if ( isMaster )
- handler.setMasterDevice( (QtSVGDevice*) ( pls->dev ) );
+ handler.setMasterDevice( (QtSVGDevice *) ( pls->dev ) );
if ( pls->xlength > pls->ylength )
- ( (QtSVGDevice*) ( pls->dev ) )->downscale = (PLFLT) pls-...
[truncated message content] |
