Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11970] trunk
|
From: <ai...@us...> - 2011-10-14 08:30:26
|
Revision: 11970
http://plplot.svn.sourceforge.net/plplot/?rev=11970&view=rev
Author: airwin
Date: 2011-10-14 08:30:19 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Style previous changes. ctest shows no obvious issues with these
changes (and Andrew's previous compiler warning fix changes).
Modified Paths:
--------------
trunk/drivers/svg.c
trunk/examples/c/x11c.c
trunk/examples/c/x14c.c
trunk/examples/c/x16c.c
trunk/examples/c/x19c.c
trunk/examples/c/x21c.c
trunk/examples/c/x22c.c
trunk/examples/c/x23c.c
trunk/examples/c/x26c.c
trunk/examples/c/x27c.c
trunk/examples/c/x28c.c
trunk/examples/c/x29c.c
trunk/examples/c/x33c.c
trunk/examples/c/x34c.c
trunk/examples/c++/x19.cc
trunk/examples/c++/x27.cc
trunk/examples/c++/x29.cc
trunk/include/ltdl_win32.h
trunk/include/plplotP.h
trunk/lib/csa/csa.c
trunk/lib/csa/csa.h
trunk/lib/nn/nnai.c
trunk/lib/nn/nnpi.c
trunk/lib/qsastime/deltaT-gen.c
trunk/lib/qsastime/qsastime.c
trunk/src/ltdl_win32.c
trunk/src/pdfutils.c
trunk/src/plctrl.c
trunk/src/plfill.c
trunk/src/pllegend.c
Modified: trunk/drivers/svg.c
===================================================================
--- trunk/drivers/svg.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/drivers/svg.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -940,10 +940,10 @@
void svg_attr_values( SVG *aStream, const char *attribute, const char *format, ... )
{
- va_list ap;
- const char *p, *sval;
- int ival;
- double dval;
+ va_list ap;
+ const char *p, *sval;
+ int ival;
+ double dval;
svg_indent( aStream );
fprintf( aStream->svgFile, "%s=\"", attribute );
Modified: trunk/examples/c/x11c.c
===================================================================
--- trunk/examples/c/x11c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x11c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -27,12 +27,12 @@
#define YPTS 46 // Data points in y
#define LEVELS 10
-static int opt[] = { DRAW_LINEXY, DRAW_LINEXY };
+static int opt[] = { DRAW_LINEXY, DRAW_LINEXY };
-static PLFLT alt[] = { 33.0, 17.0 };
-static PLFLT az[] = { 24.0, 115.0 };
+static PLFLT alt[] = { 33.0, 17.0 };
+static PLFLT az[] = { 24.0, 115.0 };
-static const char *title[4] =
+static const char *title[4] =
{
"#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
"#frPLplot Example 11 - Alt=17, Az=115, Opt=3",
Modified: trunk/examples/c/x14c.c
===================================================================
--- trunk/examples/c/x14c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x14c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -359,7 +359,7 @@
for ( i = 0; i <= 360; i++ )
{
- r = sin( dtr * ( 5 * i ) );
+ r = sin( dtr * ( 5 * i ) );
x1[i] = x0[i] * r;
y1[i] = y0[i] * r;
}
Modified: trunk/examples/c/x16c.c
===================================================================
--- trunk/examples/c/x16c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x16c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -166,7 +166,7 @@
// Allocate data structures
clevel = (PLFLT *) calloc( (size_t) ns, sizeof ( PLFLT ) );
- shedge = (PLFLT *) calloc( (size_t) (ns + 1), sizeof ( PLFLT ) );
+ shedge = (PLFLT *) calloc( (size_t) ( ns + 1 ), sizeof ( PLFLT ) );
xg1 = (PLFLT *) calloc( (size_t) nx, sizeof ( PLFLT ) );
yg1 = (PLFLT *) calloc( (size_t) ny, sizeof ( PLFLT ) );
Modified: trunk/examples/c/x19c.c
===================================================================
--- trunk/examples/c/x19c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x19c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -44,7 +44,7 @@
// "Normalize" longitude values so that they always fall between -180.0 and
// 180.0
-PLFLT
+PLFLT
normalize_longitude( PLFLT lon )
{
PLFLT times;
Modified: trunk/examples/c/x21c.c
===================================================================
--- trunk/examples/c/x21c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x21c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -152,19 +152,19 @@
int
main( int argc, const char *argv[] )
{
- PLFLT *x, *y, *z, *clev;
- PLFLT *xg, *yg, **zg;
- PLFLT zmin, zmax, lzm, lzM;
- int i, j, k;
- PLINT alg;
- const char *title[] = { "Cubic Spline Approximation",
- "Delaunay Linear Interpolation",
- "Natural Neighbors Interpolation",
- "KNN Inv. Distance Weighted",
- "3NN Linear Interpolation",
- "4NN Around Inv. Dist. Weighted" };
+ PLFLT *x, *y, *z, *clev;
+ PLFLT *xg, *yg, **zg;
+ PLFLT zmin, zmax, lzm, lzM;
+ int i, j, k;
+ PLINT alg;
+ const char *title[] = { "Cubic Spline Approximation",
+ "Delaunay Linear Interpolation",
+ "Natural Neighbors Interpolation",
+ "KNN Inv. Distance Weighted",
+ "3NN Linear Interpolation",
+ "4NN Around Inv. Dist. Weighted" };
- PLFLT opt[] = { 0., 0., 0., 0., 0., 0. };
+ PLFLT opt[] = { 0., 0., 0., 0., 0., 0. };
xm = ym = -0.2;
xM = yM = 0.6;
Modified: trunk/examples/c/x22c.c
===================================================================
--- trunk/examples/c/x22c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x22c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -169,7 +169,7 @@
-void
+void
f2mnmx( PLFLT **f, PLINT nx, PLINT ny, PLFLT *fnmin, PLFLT *fnmax )
{
int i, j;
@@ -190,7 +190,7 @@
//
// Vector plot of the gradient of a shielded potential (see example 9)
//
-void
+void
potential( void )
{
#if !defined ( WIN32 )
Modified: trunk/examples/c/x23c.c
===================================================================
--- trunk/examples/c/x23c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x23c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -38,7 +38,7 @@
"#gn", "#gc", "#go", "#gp", "#gr", "#gs", "#gt", "#gu", "#gf", "#gx", "#gq", "#gw",
};
-static int Type1[] = {
+static int Type1[] = {
0x0020, 0x0021, 0x0023, 0x0025, 0x0026,
0x0028, 0x0029, 0x002b, 0x002c, 0x002e,
0x002f, 0x0030, 0x0031, 0x0032, 0x0033,
@@ -89,7 +89,7 @@
"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)",
};
-static int lo[] = {
+static int lo[] = {
0x0,
0x0,
0x40,
@@ -103,7 +103,7 @@
0x22c0,
};
-static int hi[] = {
+static int hi[] = {
0x30,
0x40,
0x80,
@@ -117,7 +117,7 @@
0x2300,
};
-static int nxcells[] = {
+static int nxcells[] = {
12,
8,
8,
@@ -131,7 +131,7 @@
8,
};
-static int nycells[] = {
+static int nycells[] = {
8,
8,
8,
Modified: trunk/examples/c/x26c.c
===================================================================
--- trunk/examples/c/x26c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x26c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -100,8 +100,8 @@
NULL
};
-void plot1( int type, const char *x_label, const char *y_label,
- const char *alty_label, const char * legend_text[],
+void plot1( int type, const char *x_label, const char *y_label,
+ const char *alty_label, const char * legend_text[],
const char *title_label, const char *line_label );
//--------------------------------------------------------------------------
Modified: trunk/examples/c/x27c.c
===================================================================
--- trunk/examples/c/x27c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x27c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -48,15 +48,15 @@
// N.B. N is just a place holder since it is no longer used
// (because we now have proper termination of the angle loop).
PLFLT params[9][4] = {
- { 21.0, 7.0, 7.0, 3.0} , // Deltoid
- { 21.0, 7.0, 10.0, 3.0} ,
- { 21.0, -7.0, 10.0, 3.0} ,
- { 20.0, 3.0, 7.0, 20.0} ,
- { 20.0, 3.0, 10.0, 20.0} ,
- { 20.0, -3.0, 10.0, 20.0} ,
- { 20.0, 13.0, 7.0, 20.0} ,
- { 20.0, 13.0, 20.0, 20.0} ,
- { 20.0, -13.0, 20.0, 20.0}
+ { 21.0, 7.0, 7.0, 3.0 }, // Deltoid
+ { 21.0, 7.0, 10.0, 3.0 },
+ { 21.0, -7.0, 10.0, 3.0 },
+ { 20.0, 3.0, 7.0, 20.0 },
+ { 20.0, 3.0, 10.0, 20.0 },
+ { 20.0, -3.0, 10.0, 20.0 },
+ { 20.0, 13.0, 7.0, 20.0 },
+ { 20.0, 13.0, 20.0, 20.0 },
+ { 20.0, -13.0, 20.0, 20.0 }
};
int i;
@@ -175,7 +175,7 @@
// Proper termination of the angle loop very near the beginning
// point, see
// http://mathforum.org/mathimages/index.php/Hypotrochoid.
- windings = (PLINT) (abs( params[1] ) / gcd( (PLINT) params[0], (PLINT) params[1] ));
+ windings = (PLINT) ( abs( params[1] ) / gcd( (PLINT) params[0], (PLINT) params[1] ) );
steps = NPNT / windings;
dphi = 2.0 * PI / (PLFLT) steps;
Modified: trunk/examples/c/x28c.c
===================================================================
--- trunk/examples/c/x28c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x28c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -61,8 +61,8 @@
PLFLT radius, pitch, xpos, ypos, zpos;
// p1string must be exactly one character + the null termination
// character.
- char p1string[] = "O";
- const char *pstring = "The future of our civilization depends on software freedom.";
+ char p1string[] = "O";
+ const char *pstring = "The future of our civilization depends on software freedom.";
// Allocate and define the minimal x, y, and z to insure 3D box
x = (PLFLT *) calloc( XPTS, sizeof ( PLFLT ) );
y = (PLFLT *) calloc( YPTS, sizeof ( PLFLT ) );
Modified: trunk/examples/c/x29c.c
===================================================================
--- trunk/examples/c/x29c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x29c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -365,7 +365,7 @@
plbox( "bcnstd", xlabel_step, 0, "bcnstv", 0., 0 );
plcol0( 3 );
strncpy( title, "@frPLplot Example 29 - TAI-UTC ", 100 );
- strncat( title, title_suffix, 100 - strlen(title) );
+ strncat( title, title_suffix, 100 - strlen( title ) );
pllab( xtitle, "TAI-UTC (sec)", title );
plcol0( 4 );
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x33c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -299,25 +299,25 @@
int
main( int argc, const char *argv[] )
{
- int i, k;
- PLINT opt;
- PLINT nlegend, nturn;
- PLINT opt_array[MAX_NLEGEND];
- PLINT text_colors[MAX_NLEGEND];
- PLINT box_colors[MAX_NLEGEND];
- PLINT box_patterns[MAX_NLEGEND];
- PLFLT box_scales[MAX_NLEGEND];
- PLINT box_line_widths[MAX_NLEGEND];
- PLINT line_colors[MAX_NLEGEND];
- PLINT line_styles[MAX_NLEGEND];
- PLINT line_widths[MAX_NLEGEND];
- PLINT symbol_numbers[MAX_NLEGEND], symbol_colors[MAX_NLEGEND];
- PLFLT symbol_scales[MAX_NLEGEND];
- char *text[MAX_NLEGEND];
+ int i, k;
+ PLINT opt;
+ PLINT nlegend, nturn;
+ PLINT opt_array[MAX_NLEGEND];
+ PLINT text_colors[MAX_NLEGEND];
+ PLINT box_colors[MAX_NLEGEND];
+ PLINT box_patterns[MAX_NLEGEND];
+ PLFLT box_scales[MAX_NLEGEND];
+ PLINT box_line_widths[MAX_NLEGEND];
+ PLINT line_colors[MAX_NLEGEND];
+ PLINT line_styles[MAX_NLEGEND];
+ PLINT line_widths[MAX_NLEGEND];
+ PLINT symbol_numbers[MAX_NLEGEND], symbol_colors[MAX_NLEGEND];
+ PLFLT symbol_scales[MAX_NLEGEND];
+ char *text[MAX_NLEGEND];
const char *symbols[MAX_NLEGEND];
- PLFLT legend_width, legend_height, x, y, xstart, ystart;
- PLFLT max_height, text_scale;
- PLINT position, opt_base, nrow, ncolumn;
+ PLFLT legend_width, legend_height, x, y, xstart, ystart;
+ PLFLT max_height, text_scale;
+ PLINT position, opt_base, nrow, ncolumn;
// Create space to contain legend text.
for ( k = 0; k < MAX_NLEGEND; k++ )
Modified: trunk/examples/c/x34c.c
===================================================================
--- trunk/examples/c/x34c.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c/x34c.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -80,7 +80,7 @@
// Clean up
plend();
- exit(0);
+ exit( 0 );
}
void initialize_colors( void )
Modified: trunk/examples/c++/x19.cc
===================================================================
--- trunk/examples/c++/x19.cc 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c++/x19.cc 2011-10-14 08:30:19 UTC (rev 11970)
@@ -103,7 +103,7 @@
geolocation_labeler( PLINT axis, PLFLT value, char *label, PLINT length, PLPointer data )
{
const char *direction_label = "";
- PLFLT label_val = 0.0;
+ PLFLT label_val = 0.0;
if ( axis == PL_Y_AXIS )
{
Modified: trunk/examples/c++/x27.cc
===================================================================
--- trunk/examples/c++/x27.cc 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c++/x27.cc 2011-10-14 08:30:19 UTC (rev 11970)
@@ -60,15 +60,15 @@
// N.B. N is just a place holder since it is no longer used
// (because we now have proper termination of the angle loop).
PLFLT params[9][4] = {
- { 21.0, 7.0, 7.0, 3.0} , // Deltoid
- { 21.0, 7.0, 10.0, 3.0} ,
- { 21.0, -7.0, 10.0, 3.0} ,
- { 20.0, 3.0, 7.0, 20.0} ,
- { 20.0, 3.0, 10.0, 20.0} ,
- { 20.0, -3.0, 10.0, 20.0} ,
- { 20.0, 13.0, 7.0, 20.0} ,
- { 20.0, 13.0, 20.0, 20.0} ,
- { 20.0, -13.0, 20.0, 20.0}
+ { 21.0, 7.0, 7.0, 3.0 }, // Deltoid
+ { 21.0, 7.0, 10.0, 3.0 },
+ { 21.0, -7.0, 10.0, 3.0 },
+ { 20.0, 3.0, 7.0, 20.0 },
+ { 20.0, 3.0, 10.0, 20.0 },
+ { 20.0, -3.0, 10.0, 20.0 },
+ { 20.0, 13.0, 7.0, 20.0 },
+ { 20.0, 13.0, 20.0, 20.0 },
+ { 20.0, -13.0, 20.0, 20.0 }
};
int i;
Modified: trunk/examples/c++/x29.cc
===================================================================
--- trunk/examples/c++/x29.cc 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/examples/c++/x29.cc 2011-10-14 08:30:19 UTC (rev 11970)
@@ -375,7 +375,7 @@
pls->box( "bcnstd", xlabel_step, 0, "bcnstv", 0., 0 );
pls->col0( 3 );
strncpy( title, "@frPLplot Example 29 - TAI-UTC ", 100 );
- strncat( title, title_suffix, 100 - strlen(title) );
+ strncat( title, title_suffix, 100 - strlen( title ) );
pls->lab( xtitle, "TAI-UTC (sec)", title );
pls->col0( 4 );
Modified: trunk/include/ltdl_win32.h
===================================================================
--- trunk/include/ltdl_win32.h 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/include/ltdl_win32.h 2011-10-14 08:30:19 UTC (rev 11970)
@@ -46,6 +46,6 @@
PLDLLIMPEXP void* lt_dlsym( lt_dlhandle dlhandle, const char* symbol );
-PLDLLIMPEXP int lt_dlmakeresident (lt_dlhandle handle);
+PLDLLIMPEXP int lt_dlmakeresident( lt_dlhandle handle );
#endif // __LTDL_WIN32_H__
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/include/plplotP.h 2011-10-14 08:30:19 UTC (rev 11970)
@@ -1153,7 +1153,7 @@
// struct used for FCI to FontName lookups.
typedef struct
{
- PLUNICODE fci;
+ PLUNICODE fci;
const unsigned char *pfont;
} FCI_to_FontName_Table;
Modified: trunk/lib/csa/csa.c
===================================================================
--- trunk/lib/csa/csa.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/csa/csa.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -673,8 +673,8 @@
for ( ii = 0; ii < t->npoints; ++ii )
{
point * p = t->points[ii];
- i = (int) floor( ( p->x - xmin ) / h );
- j = (int) floor( ( p->y - ymin ) / h );
+ i = (int) floor( ( p->x - xmin ) / h );
+ j = (int) floor( ( p->y - ymin ) / h );
square* s = squares[j][i];
if ( s->npoints == 0 )
Modified: trunk/lib/csa/csa.h
===================================================================
--- trunk/lib/csa/csa.h 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/csa/csa.h 2011-10-14 08:30:19 UTC (rev 11970)
@@ -34,7 +34,7 @@
} point;
#endif
-extern int csa_verbose;
+extern int csa_verbose;
extern const char* csa_version;
struct csa;
Modified: trunk/lib/nn/nnai.c
===================================================================
--- trunk/lib/nn/nnai.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/nn/nnai.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -63,7 +63,7 @@
//
nnai* nnai_build( delaunay* d, int n, double* x, double* y )
{
- nnai * nn = malloc( sizeof ( nnai ) );
+ nnai * nn = malloc( sizeof ( nnai ) );
nnpi * nnp = nnpi_create( d );
int * vertices;
double* weights;
Modified: trunk/lib/nn/nnpi.c
===================================================================
--- trunk/lib/nn/nnpi.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/nn/nnpi.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -517,7 +517,7 @@
//
void nnhpi_interpolate( nnhpi* nnhp, point* p )
{
- nnpi * nnp = nnhp->nnpi;
+ nnpi * nnp = nnhp->nnpi;
delaunay * d = nnp->d;
hashtable * ht_weights = nnhp->ht_weights;
nn_weights* weights;
Modified: trunk/lib/qsastime/deltaT-gen.c
===================================================================
--- trunk/lib/qsastime/deltaT-gen.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/qsastime/deltaT-gen.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -78,13 +78,13 @@
int i = 0;
int number_of_lines = 0;
- if ( (argc < 2) || ( fr = fopen( argv[1], "r" ) ) == NULL )
+ if ( ( argc < 2 ) || ( fr = fopen( argv[1], "r" ) ) == NULL )
{
fprintf( stderr, "Cannot open first file as readable\n" );
exit( 1 );
}
- if ( (argc < 3) || ( fw = fopen( argv[2], "w" ) ) == NULL )
+ if ( ( argc < 3 ) || ( fw = fopen( argv[2], "w" ) ) == NULL )
{
fprintf( stderr, "Cannot open second file as writable\n" );
exit( 1 );
Modified: trunk/lib/qsastime/qsastime.c
===================================================================
--- trunk/lib/qsastime/qsastime.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/lib/qsastime/qsastime.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -334,7 +334,7 @@
const char * getDayOfWeek( const MJDtime *MJD )
{
static const char *dow = { "Wed\0Thu\0Fri\0Sat\0Sun\0Mon\0Tue" };
- int d = MJD->base_day % 7;
+ int d = MJD->base_day % 7;
if ( d < 0 )
d += 7;
return &( dow[d * 4] );
@@ -343,7 +343,7 @@
const char * getLongDayOfWeek( const MJDtime *MJD )
{
static const char *dow = { "Wednesday\0Thursday\0\0Friday\0\0\0\0Saturday\0\0Sunday\0\0\0\0Monday\0\0\0\0Tuesday" };
- int d = MJD->base_day % 7;
+ int d = MJD->base_day % 7;
if ( d < 0 )
d += 7;
return &( dow[d * 10] );
Modified: trunk/src/ltdl_win32.c
===================================================================
--- trunk/src/ltdl_win32.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/src/ltdl_win32.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -113,7 +113,7 @@
}
// Placeholder that does nothing for now.
-int lt_dlmakeresident (lt_dlhandle handle)
+int lt_dlmakeresident( lt_dlhandle handle )
{
return 0;
}
Modified: trunk/src/pdfutils.c
===================================================================
--- trunk/src/pdfutils.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/src/pdfutils.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -857,12 +857,12 @@
if ( e_ieee == 0 )
{
- ex = 1 - bias;
+ ex = 1 - bias;
f_new = f_tmp;
}
else
{
- ex = (int) e_ieee - bias;
+ ex = (int) e_ieee - bias;
f_new = 1.0 + f_tmp;
}
Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/src/plctrl.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -95,7 +95,7 @@
static void
cmap0_palette_read( const char *filename,
- int *number_colors, unsigned int **r, unsigned int **g,
+ int *number_colors, unsigned int **r, unsigned int **g,
unsigned int **b, double **a );
// An additional hardwired location for lib files.
@@ -929,10 +929,10 @@
void
plcmap0_def( int imin, int imax )
{
- int i;
+ int i;
unsigned int *r, *g, *b;
- double *a;
- int number_colors;
+ double *a;
+ int number_colors;
if ( imin <= imax )
{
cmap0_palette_read( "", &number_colors, &r, &g, &b, &a );
@@ -1342,7 +1342,7 @@
if ( strlen( color_info ) == 7 )
{
if ( sscanf( color_info, "#%2x%2x%2x",
- (unsigned int *) ( *r + i ), (unsigned int *) ( *g + i ),
+ (unsigned int *) ( *r + i ), (unsigned int *) ( *g + i ),
(unsigned int *) ( *b + i ) ) != 3 )
{
err = 1;
@@ -1353,7 +1353,7 @@
else if ( strlen( color_info ) > 9 )
{
if ( sscanf( color_info, "#%2x%2x%2x %lf",
- (unsigned int *) ( *r + i ), (unsigned int *) ( *g + i ),
+ (unsigned int *) ( *r + i ), (unsigned int *) ( *g + i ),
(unsigned int *) ( *b + i ), (double *) ( *a + i ) ) != 4 )
{
err = 1;
@@ -1430,10 +1430,10 @@
void
c_plspal0( const char *filename )
{
- int i;
+ int i;
unsigned int *r, *g, *b;
- double *a;
- int number_colors;
+ double *a;
+ int number_colors;
cmap0_palette_read( filename, &number_colors, &r, &g, &b, &a );
// Allocate default number of cmap0 colours if cmap0 allocation not
// done already.
@@ -1478,20 +1478,20 @@
void
c_plspal1( const char *filename, PLBOOL interpolate )
{
- int i;
- int number_colors;
- int format_version, err;
- PLBOOL rgb;
- char color_info[PALLEN];
- unsigned int r_i, g_i, b_i;
- int pos_i, rev_i;
- double r_d, g_d, b_d, a_d, pos_d;
- PLFLT *r, *g, *b, *a, *pos;
- PLINT *ri, *gi, *bi;
- PLBOOL *rev;
- FILE *fp;
- char msgbuf[MSGLEN];
- char * save_locale = plsave_set_locale();
+ int i;
+ int number_colors;
+ int format_version, err;
+ PLBOOL rgb;
+ char color_info[PALLEN];
+ unsigned int r_i, g_i, b_i;
+ int pos_i, rev_i;
+ double r_d, g_d, b_d, a_d, pos_d;
+ PLFLT *r, *g, *b, *a, *pos;
+ PLINT *ri, *gi, *bi;
+ PLBOOL *rev;
+ FILE *fp;
+ char msgbuf[MSGLEN];
+ char * save_locale = plsave_set_locale();
rgb = TRUE;
err = 0;
Modified: trunk/src/plfill.c
===================================================================
--- trunk/src/plfill.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/src/plfill.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -1599,7 +1599,7 @@
{
i1intersect[ncrossed] = i1;
if ( ncrossed_change == 2 )
- ;
+ ;
i1intersect[1] = i1;
ncrossed += ncrossed_change;
Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c 2011-10-14 08:03:51 UTC (rev 11969)
+++ trunk/src/pllegend.c 2011-10-14 08:30:19 UTC (rev 11970)
@@ -943,7 +943,7 @@
static void
draw_cap( PLBOOL if_edge, PLINT orientation, PLFLT xmin, PLFLT xmax,
- PLFLT ymin, PLFLT ymax, PLFLT color )
+ PLFLT ymin, PLFLT ymax, PLFLT color )
{
// Save current drawing color.
PLINT col0_save = plsc->icol0;
@@ -1120,9 +1120,9 @@
PLFLT label_offset = 1.2;
// For building plmtex option string.
-#define max_opts 25
- char opt_label[max_opts];
- char perp;
+#define max_opts 25
+ char opt_label[max_opts];
+ char perp;
// To help sanity check number of specified labels.
PLINT nlabel = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
