Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12661] trunk
|
From: <ai...@us...> - 2013-11-05 16:24:15
|
Revision: 12661
http://sourceforge.net/p/plplot/code/12661
Author: airwin
Date: 2013-11-05 16:24:11 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Style previous commits.
Modified Paths:
--------------
trunk/bindings/f95/scstubs.c
trunk/bindings/java/plplotjavac.i
trunk/bindings/python/plplot_widgetmodule.c
trunk/bindings/python/plplotcmodule.i
trunk/examples/c/x22c.c
trunk/src/plfreetype.c
trunk/src/plmap.c
trunk/src/plvect.c
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/bindings/f95/scstubs.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -414,10 +414,10 @@
PLFLT **a;
int i, j;
- a = (PLFLT **) malloc( sizeof ( PLFLT * ) * ( size_t ) ( *n_axes ) );
+ a = (PLFLT **) malloc( sizeof ( PLFLT * ) * (size_t) ( *n_axes ) );
for ( i = 0; i < *n_axes; i++ )
{
- a[i] = (PLFLT *) malloc( sizeof ( PLFLT ) * ( size_t ) n_values[i] );
+ a[i] = (PLFLT *) malloc( sizeof ( PLFLT ) * (size_t) n_values[i] );
for ( j = 0; j < n_values[i]; j++ )
{
a[i][j] = values[i + j * ( *n_axes )];
@@ -1019,7 +1019,7 @@
}
void
-PLPATH( PLINT *n, PLFLT *x1, PLFLT *y1, PLFLT *x2, PLFLT *y2 )
+PLPATH( PLINT *n, PLFLT *x1, PLFLT *y1, PLFLT *x2, PLFLT *y2 )
{
c_plpath( *n, *x1, *y1, *x2, *y2 );
}
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/bindings/java/plplotjavac.i 2013-11-05 16:24:11 UTC (rev 12661)
@@ -197,7 +197,7 @@
setup_array_1d_b( PLBOOL **pa, jboolean *adat, int n )
{
int i;
- *pa = (PLBOOL *) malloc( ( size_t ) n * sizeof ( PLBOOL ) );
+ *pa = (PLBOOL *) malloc( (size_t) n * sizeof ( PLBOOL ) );
for ( i = 0; i < n; i++ )
{
( *pa )[i] = adat[i] ? 1 : 0;
@@ -210,7 +210,7 @@
setup_array_1d_i( PLINT **pa, jint *adat, int n )
{
int i;
- *pa = (PLINT *) malloc( ( size_t ) n * sizeof ( PLINT ) );
+ *pa = (PLINT *) malloc( (size_t) n * sizeof ( PLINT ) );
for ( i = 0; i < n; i++ )
{
( *pa )[i] = adat[i];
@@ -223,7 +223,7 @@
setup_array_1d_f( PLFLT **pa, jfloat *adat, int n )
{
int i;
- *pa = (PLFLT *) malloc( ( size_t ) n * sizeof ( PLFLT ) );
+ *pa = (PLFLT *) malloc( (size_t) n * sizeof ( PLFLT ) );
for ( i = 0; i < n; i++ )
{
( *pa )[i] = adat[i];
@@ -236,7 +236,7 @@
setup_array_1d_d( PLFLT **pa, jdouble *adat, int n )
{
int i;
- *pa = (PLFLT *) malloc( ( size_t ) n * sizeof ( PLFLT ) );
+ *pa = (PLFLT *) malloc( (size_t) n * sizeof ( PLFLT ) );
for ( i = 0; i < n; i++ )
{
( *pa )[i] = adat[i];
@@ -251,8 +251,8 @@
{
int i, j;
- *pa = (PLFLT **) malloc( ( size_t ) nx * sizeof ( PLFLT * ) );
- ( *pa )[0] = (PLFLT *) malloc( ( size_t ) ( nx * ny ) * sizeof ( PLFLT ) );
+ *pa = (PLFLT **) malloc( (size_t) nx * sizeof ( PLFLT * ) );
+ ( *pa )[0] = (PLFLT *) malloc( (size_t) ( nx * ny ) * sizeof ( PLFLT ) );
for ( i = 0; i < nx; i++ )
{
@@ -270,8 +270,8 @@
{
int i, j;
- *pa = (PLFLT **) malloc( ( size_t ) nx * sizeof ( PLFLT * ) );
- ( *pa )[0] = (PLFLT *) malloc( ( size_t ) ( nx * ny ) * sizeof ( PLFLT ) );
+ *pa = (PLFLT **) malloc( (size_t) nx * sizeof ( PLFLT * ) );
+ ( *pa )[0] = (PLFLT *) malloc( (size_t) ( nx * ny ) * sizeof ( PLFLT ) );
for ( i = 0; i < nx; i++ )
{
@@ -292,7 +292,7 @@
#ifdef PL_DOUBLE
x = (double *) dat;
#else
- x = (double *) malloc( ( size_t ) n * sizeof ( double ) );
+ x = (double *) malloc( (size_t) n * sizeof ( double ) );
for ( i = 0; i < n; i++ )
{
x[i] = (double) dat[i];
@@ -915,8 +915,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -982,8 +982,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1040,8 +1040,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1094,8 +1094,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1178,8 +1178,8 @@
return;
}
- ptr = (PLFLT **) malloc( ( size_t ) nx * sizeof ( PLFLT * ) );
- ptr[0] = (PLFLT *) malloc( ( size_t ) nx * ny * sizeof ( PLFLT ) );
+ ptr = (PLFLT **) malloc( (size_t) nx * sizeof ( PLFLT * ) );
+ ptr[0] = (PLFLT *) malloc( (size_t) nx * ny * sizeof ( PLFLT ) );
for ( i = 0; i < nx; i++ )
{
ptr[i] = ptr[0] + i * ny;
@@ -1197,8 +1197,8 @@
ptr = $1;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
for ( i = 0; i < nx; i++ )
{
@@ -1254,8 +1254,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1569,8 +1569,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1645,8 +1645,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1713,8 +1713,8 @@
int nx = ( *jenv )->GetArrayLength( jenv, $input );
int ny = -1;
int i, j;
- ai = (jobject *) malloc( ( size_t ) nx * sizeof ( jobject ) );
- adat = (jPLFLT **) malloc( ( size_t ) nx * sizeof ( jPLFLT * ) );
+ ai = (jobject *) malloc( (size_t) nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( (size_t) nx * sizeof ( jPLFLT * ) );
( *jenv )->EnsureLocalCapacity( jenv, nx );
@@ -1807,7 +1807,7 @@
// Take a copy of the C string as the typemap is for a non const C string
jmethodID capacityID = ( *jenv )->GetMethodID( jenv, sbufClass, "capacity", "()I" );
jint capacity = ( *jenv )->CallIntMethod( jenv, $input, capacityID );
- $1 = (char *) malloc( ( size_t ) ( capacity + 1 ) );
+ $1 = (char *) malloc( (size_t) ( capacity + 1 ) );
// Zero the original StringBuffer, so we can replace it with the result
setLengthID = ( *jenv )->GetMethodID( jenv, sbufClass, "setLength", "(I)V" );
@@ -1852,7 +1852,7 @@
int i = 0;
size = (int) ( ( *jenv )->GetArrayLength( jenv, $input ) );
$1 = &size;
- $2 = (char **) malloc( ( size_t ) ( size + 1 ) * sizeof ( char * ) );
+ $2 = (char **) malloc( (size_t) ( size + 1 ) * sizeof ( char * ) );
// make a copy of each string
for ( i = 0; i < size; i++ )
{
@@ -1931,7 +1931,7 @@
printf( "Arrays must be the same length\n" );
return;
}
- $1 = (char **) malloc( ( size_t ) Alen * sizeof ( char * ) );
+ $1 = (char **) malloc( (size_t) Alen * sizeof ( char * ) );
// make a copy of each string
for ( i = 0; i < Alen; i++ )
{
@@ -1977,7 +1977,7 @@
int size = ( *jenv )->GetArrayLength( jenv, $input );
Alen = size;
$1 = size;
- $2 = (char **) malloc( ( size_t ) Alen * sizeof ( char * ) );
+ $2 = (char **) malloc( (size_t) Alen * sizeof ( char * ) );
// make a copy of each string
for ( i = 0; i < Alen; i++ )
{
Modified: trunk/bindings/python/plplot_widgetmodule.c
===================================================================
--- trunk/bindings/python/plplot_widgetmodule.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/bindings/python/plplot_widgetmodule.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -12,7 +12,7 @@
#endif
void initplplot_widget( void );
-
+
#define TRY( E ) if ( !( E ) ) return NULL
#ifdef ENABLE_tk
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/bindings/python/plplotcmodule.i 2013-11-05 16:24:11 UTC (rev 12661)
@@ -113,8 +113,7 @@
#if SIZEOF_LONG != 4
%wrapper
%{
-
- PyArrayObject* myIntArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims );
+ PyArrayObject* myIntArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims );
// some really twisted stuff to allow calling a single precision library from python
PyArrayObject* myIntArray_ContiguousFromObject( PyObject* in, int PL_UNUSED( type ), int mindims, int maxdims )
@@ -481,7 +480,7 @@
$2 = PyArray_DIMS( tmp )[0];
$3 = PyArray_DIMS( tmp )[1];
size = $3;
- $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) $2 );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) $2 );
for ( i = 0; i < $2; i++ )
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
@@ -501,7 +500,7 @@
Xlen = $2 = PyArray_DIMS( tmp )[0];
Ylen = $3 = PyArray_DIMS( tmp )[1];
size = $3;
- $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) $2 );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) $2 );
for ( i = 0; i < $2; i++ )
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
@@ -521,7 +520,7 @@
Xlen = PyArray_DIMS( tmp )[0];
Ylen = PyArray_DIMS( tmp )[1];
size = Ylen;
- $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) Xlen );
for ( i = 0; i < Xlen; i++ )
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
@@ -558,7 +557,7 @@
return NULL;
}
size = Ylen;
- $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) Xlen );
for ( i = 0; i < Xlen; i++ )
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
@@ -581,7 +580,7 @@
return NULL;
}
size = Ylen;
- $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) Xlen );
+ $1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) Xlen );
for ( i = 0; i < Xlen; i++ )
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
@@ -611,7 +610,7 @@
if ( !array )
return NULL;
size = Ylen;
- $3 = (double **) malloc( sizeof ( double * ) * ( size_t ) Xlen );
+ $3 = (double **) malloc( sizeof ( double * ) * (size_t) Xlen );
for ( i = 0; i < Xlen; i++ )
$3[i] = ( (double *) PyArray_DATA( (PyArrayObject *) array ) + i * size );
}
@@ -640,7 +639,7 @@
PyErr_SetString( PyExc_ValueError, "Vectors must be same length." );
return NULL;
}
- $1 = (char **) malloc( sizeof ( char* ) * ( size_t ) Alen );
+ $1 = (char **) malloc( sizeof ( char* ) * (size_t) Alen );
for ( i = 0; i < Alen; i++ )
{
$1[i] = (char *) PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
@@ -662,7 +661,7 @@
return NULL;
Alen = PyArray_DIMS( tmp )[0];
$1 = Alen;
- $2 = (char **) malloc( sizeof ( char* ) * ( size_t ) Alen );
+ $2 = (char **) malloc( sizeof ( char* ) * (size_t) Alen );
for ( i = 0; i < Alen; i++ )
{
$2[i] = (char *) PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
@@ -744,8 +743,8 @@
PyErr_SetString( PyExc_ValueError, "Expected a sequence to two 1D arrays." );
return NULL;
}
- tmpGrid1.nx = ( PLINT ) PyArray_DIMS( pltr_xg )[0];
- tmpGrid1.ny = ( PLINT ) PyArray_DIMS( pltr_yg )[0];
+ tmpGrid1.nx = (PLINT) PyArray_DIMS( pltr_xg )[0];
+ tmpGrid1.ny = (PLINT) PyArray_DIMS( pltr_yg )[0];
if ( isimg == 0 )
{
if ( Xlen != tmpGrid1.nx || Ylen != tmpGrid1.ny )
@@ -798,8 +797,8 @@
PyErr_SetString( PyExc_ValueError, "Arrays must be same size." );
return NULL;
}
- tmpGrid2.nx = ( PLINT ) PyArray_DIMS( pltr_xg )[0];
- tmpGrid2.ny = ( PLINT ) PyArray_DIMS( pltr_xg )[1];
+ tmpGrid2.nx = (PLINT) PyArray_DIMS( pltr_xg )[0];
+ tmpGrid2.ny = (PLINT) PyArray_DIMS( pltr_xg )[1];
if ( isimg == 0 )
{
if ( Xlen != tmpGrid2.nx || Ylen != tmpGrid2.ny )
@@ -817,10 +816,10 @@
}
}
size = tmpGrid2.ny;
- tmpGrid2.xg = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) tmpGrid2.nx );
+ tmpGrid2.xg = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
tmpGrid2.xg[i] = ( (PLFLT *) PyArray_DATA( pltr_xg ) + i * size );
- tmpGrid2.yg = (PLFLT **) malloc( sizeof ( PLFLT* ) * ( size_t ) tmpGrid2.nx );
+ tmpGrid2.yg = (PLFLT **) malloc( sizeof ( PLFLT* ) * (size_t) tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
tmpGrid2.yg[i] = ( (PLFLT *) PyArray_DATA( pltr_yg ) + i * size );
return &tmpGrid2;
@@ -1524,7 +1523,7 @@
}
tmp = PyList_Size( $input );
$1 = &tmp;
- $2 = (char **) malloc( ( size_t ) ( tmp + 1 ) * sizeof ( char * ) );
+ $2 = (char **) malloc( (size_t) ( tmp + 1 ) * sizeof ( char * ) );
for ( i = 0; i < tmp; i++ )
{
PyObject *s = PyList_GetItem( $input, i );
Modified: trunk/examples/c/x22c.c
===================================================================
--- trunk/examples/c/x22c.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/examples/c/x22c.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -143,7 +143,7 @@
if ( fabs( y ) < b )
{
dbdx = ymax / 4.0 * sin( M_PI * x / xmax ) *
- M_PI / xmax * y / b;
+ M_PI / xmax * y / b;
u[i][j] = Q * ymax / b;
v[i][j] = dbdx * u[i][j];
}
@@ -175,14 +175,14 @@
void
transform( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data )
{
- PLFLT *trdata;
- PLFLT xmax;
+ PLFLT *trdata;
+ PLFLT xmax;
- trdata = (PLFLT *) data;
- xmax = *trdata;
+ trdata = (PLFLT *) data;
+ xmax = *trdata;
- *xt = x;
- *yt = y / 4.0 * ( 3 - cos( M_PI * x / xmax ) );
+ *xt = x;
+ *yt = y / 4.0 * ( 3 - cos( M_PI * x / xmax ) );
}
//
@@ -198,9 +198,9 @@
PLFLT Q, b, dbdx;
PLcGrid2 cgrid2;
PLFLT **u, **v;
- const int nx = 20;
- const int ny = 20;
- const int nc = 11;
+ const int nx = 20;
+ const int ny = 20;
+ const int nc = 11;
const int nseg = 20;
PLFLT clev[nc];
@@ -212,7 +212,7 @@
ymin = -ny / 2 * dy;
ymax = ny / 2 * dy;
- plstransform(transform, (PLPointer) &xmax);
+ plstransform( transform, ( PLPointer ) & xmax );
plAlloc2dGrid( &cgrid2.xg, nx, ny );
plAlloc2dGrid( &cgrid2.yg, nx, ny );
@@ -231,27 +231,28 @@
y = ( j - ny / 2 + 0.5 ) * dy;
cgrid2.xg[i][j] = x;
cgrid2.yg[i][j] = y;
- b = ymax / 4.0 * ( 3 - cos( M_PI * x / xmax ) );
- u[i][j] = Q * ymax / b;
- v[i][j] = 0.0;
+ b = ymax / 4.0 * ( 3 - cos( M_PI * x / xmax ) );
+ u[i][j] = Q * ymax / b;
+ v[i][j] = 0.0;
}
}
- for ( i=0; i<nc; i++ ) {
- clev[i] = Q + i * Q / (nc-1);
+ for ( i = 0; i < nc; i++ )
+ {
+ clev[i] = Q + i * Q / ( nc - 1 );
}
-
+
plenv( xmin, xmax, ymin, ymax, 0, 0 );
pllab( "(x)", "(y)", "#frPLplot Example 22 - constriction" );
plcol0( 2 );
- plshades( (const PLFLT * const *) u, nx, ny, NULL,
- xmin+dx/2, xmax-dx/2, ymin+dy/2, ymax-dy/2,
- clev, nc, 0, 1, 1.0, plfill, 1, NULL, NULL);
- plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny,
- -0.5, pltr2, (void *) &cgrid2 );
+ plshades( (const PLFLT * const *) u, nx, ny, NULL,
+ xmin + dx / 2, xmax - dx / 2, ymin + dy / 2, ymax - dy / 2,
+ clev, nc, 0, 1, 1.0, plfill, 1, NULL, NULL );
+ plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny,
+ -0.5, pltr2, (void *) &cgrid2 );
// Plot edges using plpath (which accounts for coordinate transformation) rather than plline
- plpath(nseg,xmin,ymax,xmax,ymax);
- plpath(nseg,xmin,ymin,xmax,ymin);
+ plpath( nseg, xmin, ymax, xmax, ymax );
+ plpath( nseg, xmin, ymin, xmax, ymin );
plcol0( 1 );
plFree2dGrid( cgrid2.xg, nx, ny );
@@ -259,8 +260,7 @@
plFree2dGrid( u, nx, ny );
plFree2dGrid( v, nx, ny );
- plstransform(NULL, NULL);
-
+ plstransform( NULL, NULL );
}
Modified: trunk/src/plfreetype.c
===================================================================
--- trunk/src/plfreetype.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/src/plfreetype.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -225,7 +225,7 @@
{
// FCI in text stream; change font accordingly.
FT_SetFace( pls, text[i] );
- *yy = (int) (FT->face->size->metrics.height > -*yy ? -FT->face->size->metrics.height : *yy);
+ *yy = (int) ( FT->face->size->metrics.height > -*yy ? -FT->face->size->metrics.height : *yy );
}
else
{
Modified: trunk/src/plmap.c
===================================================================
--- trunk/src/plmap.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/src/plmap.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -169,8 +169,8 @@
}
#endif
- bufx = malloc( ( size_t ) ncopies * sizeof ( PLFLT* ) );
- bufy = malloc( ( size_t ) ncopies * sizeof ( PLFLT* ) );
+ bufx = malloc( (size_t) ncopies * sizeof ( PLFLT* ) );
+ bufy = malloc( (size_t) ncopies * sizeof ( PLFLT* ) );
for ( i = 0; i < ncopies; i++ )
{
bufx[i] = NULL;
@@ -206,8 +206,8 @@
free( bufx[i] );
if ( bufy[i] )
free( bufy[i] );
- bufx[i] = malloc( ( size_t ) bufsize * sizeof ( double ) );
- bufy[i] = malloc( ( size_t ) bufsize * sizeof ( double ) );
+ bufx[i] = malloc( (size_t) bufsize * sizeof ( double ) );
+ bufy[i] = malloc( (size_t) bufsize * sizeof ( double ) );
}
}
Modified: trunk/src/plvect.c
===================================================================
--- trunk/src/plvect.c 2013-11-05 15:16:33 UTC (rev 12660)
+++ trunk/src/plvect.c 2013-11-05 16:24:11 UTC (rev 12661)
@@ -191,7 +191,7 @@
vmax = ( v[i][j] > vmax ) ? v[i][j] : vmax;
}
}
- lscale = 1.5*MIN(dxmin / umax, dymin / vmax);
+ lscale = 1.5 * MIN( dxmin / umax, dymin / vmax );
if ( scale < 0.0 )
{
scale = -scale * lscale;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
