Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10552] trunk
|
From: <and...@us...> - 2009-10-26 13:56:03
|
Revision: 10552
http://plplot.svn.sourceforge.net/plplot/?rev=10552&view=rev
Author: andrewross
Date: 2009-10-26 13:55:52 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Set threshold of 12 spaces before variable name, = sign etc in variable definitions, typedefs, enums and assignments. This prevents very large numbers of spaces being added to achieve alignment. Very large numbers of spaces look odd, are hard to read and lead to long lines.
I first noticed this with C++, but it applies to a lot of the C code as well.
Modified Paths:
--------------
trunk/bindings/gnome2/lib/gcw-lib.c
trunk/bindings/qt_gui/plqt.cpp
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tcl/tclMatrix.c
trunk/bindings/tcl/tclMatrix.h
trunk/bindings/tk/plframe.c
trunk/bindings/tk/tcpip.c
trunk/bindings/tk-x-plat/plplotter.c
trunk/drivers/aqt.c
trunk/drivers/cairo.c
trunk/drivers/gd.c
trunk/drivers/impress.c
trunk/drivers/ljii.c
trunk/drivers/ljiip.c
trunk/drivers/mem.c
trunk/drivers/ntk.c
trunk/drivers/pbm.c
trunk/drivers/pdf.c
trunk/drivers/ps.c
trunk/drivers/qt.cpp
trunk/drivers/svg.c
trunk/drivers/tkwin.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.h
trunk/drivers/wxwidgets_app.cpp
trunk/drivers/xfig.c
trunk/drivers/xwin.c
trunk/examples/c/x16c.c
trunk/examples/c/x20c.c
trunk/examples/c/x22c.c
trunk/examples/c++/x01cc.cc
trunk/examples/c++/x12.cc
trunk/examples/c++/x16.cc
trunk/examples/c++/x20.cc
trunk/examples/c++/x22.cc
trunk/include/plfreetype.h
trunk/include/plplotP.h
trunk/include/plunicode-type1.h
trunk/include/qt.h
trunk/lib/csa/csa.c
trunk/lib/nistcd/cd.c
trunk/lib/nn/delaunay.c
trunk/lib/nn/delaunay.h
trunk/lib/nn/hash.c
trunk/lib/nn/nnai.c
trunk/lib/nn/nnpi.c
trunk/lib/qsastime/tai-utc-gen.c
trunk/src/ltdl_win32.c
trunk/src/pdfutils.c
trunk/src/plargs.c
trunk/src/plbuf.c
trunk/src/plcore.c
trunk/src/plshade.c
trunk/src/plsym.c
trunk/uncrustify.cfg
trunk/utils/plrender.c
Modified: trunk/bindings/gnome2/lib/gcw-lib.c
===================================================================
--- trunk/bindings/gnome2/lib/gcw-lib.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/gnome2/lib/gcw-lib.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -208,7 +208,7 @@
gdouble curmag, dum;
/* Get the current canvas */
- n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
+ n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
scrolled_window = gtk_notebook_get_nth_page( GTK_NOTEBOOK( dev->notebook ), n );
canvas = GNOME_CANVAS( gtk_container_get_children(
GTK_CONTAINER( gtk_container_get_children(
@@ -411,7 +411,7 @@
}
/* Get the current canvas */
- n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
+ n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
scrolled_window = gtk_notebook_get_nth_page( GTK_NOTEBOOK( dev->notebook ), n );
canvas = GNOME_CANVAS( gtk_container_get_children(
GTK_CONTAINER( gtk_container_get_children(
@@ -475,7 +475,7 @@
guint n;
/* Get the current canvas */
- n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
+ n = gtk_notebook_get_current_page( GTK_NOTEBOOK( dev->notebook ));
scrolled_window = gtk_notebook_get_nth_page( GTK_NOTEBOOK( dev->notebook ), n );
canvas = GNOME_CANVAS( gtk_container_get_children(
GTK_CONTAINER( gtk_container_get_children(
Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/qt_gui/plqt.cpp 2009-10-26 13:55:52 UTC (rev 10552)
@@ -806,7 +806,7 @@
el.Data.TextStruct->fci = fci;
PLFLT rotation, shear, stride;
plRotationShear( txt->xform, &rotation, &shear, &stride );
- rotation -= pls->diorot * M_PI / 2.0;
+ rotation -= pls->diorot * M_PI / 2.0;
el.Data.TextStruct->rotation = rotation;
el.Data.TextStruct->shear = shear;
el.Data.TextStruct->stride = stride;
@@ -1095,7 +1095,7 @@
cursorParameters.isTracking = false;
cursorParameters.cursor_x = -1.0;
cursorParameters.cursor_y = -1.0;
- killed = false;
+ killed = false;
}
QtExtWidget::~QtExtWidget()
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tcl/tclAPI.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -258,7 +258,7 @@
plTclCmd( char *cmdlist, Tcl_Interp *interp, int argc, const char **argv )
{
register Tcl_HashEntry *hPtr;
- int result = TCL_OK;
+ int result = TCL_OK;
pl_errcode = 0; errmsg[0] = '\0';
@@ -326,7 +326,7 @@
int argc, const char **argv )
{
register Tcl_HashEntry *hPtr;
- int result = TCL_OK;
+ int result = TCL_OK;
argc--; argv++;
if ( argc == 0 || ( strcmp( argv[0], "cmd" ) != 0 ))
@@ -855,8 +855,8 @@
}
else
{
- nx = matf->n[0];
- ny = matf->n[1];
+ nx = matf->n[0];
+ ny = matf->n[1];
tclmateval_modx = nx;
tclmateval_mody = ny;
@@ -1189,8 +1189,8 @@
}
else
{
- nx = matu->n[0];
- ny = matu->n[1];
+ nx = matu->n[0];
+ ny = matu->n[1];
tclmateval_modx = nx;
tclmateval_mody = ny;
@@ -1216,8 +1216,8 @@
}
else
{
- nx = matv->n[0];
- ny = matv->n[1];
+ nx = matv->n[0];
+ ny = matv->n[1];
tclmateval_modx = nx;
tclmateval_mody = ny;
Modified: trunk/bindings/tcl/tclMatrix.c
===================================================================
--- trunk/bindings/tcl/tclMatrix.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tcl/tclMatrix.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -124,10 +124,10 @@
int argc, const char **argv )
{
register tclMatrix *matPtr;
- int i, j, length, new, index, persist = 0, initializer = 0;
+ int i, j, length, new, index, persist = 0, initializer = 0;
Tcl_HashEntry *hPtr;
Tcl_CmdInfo infoPtr;
- char c;
+ char c;
dbug_enter( "Tcl_MatrixCmd" );
@@ -525,11 +525,11 @@
int argc, const char **argv )
{
register tclMatrix *matPtr = (tclMatrix *) clientData;
- int length, put = 0;
- char c, tmp[80];
+ int length, put = 0;
+ char c, tmp[80];
const char *name = argv[0];
- int nmin[MAX_ARRAY_DIM], nmax[MAX_ARRAY_DIM];
- int i, j, k;
+ int nmin[MAX_ARRAY_DIM], nmax[MAX_ARRAY_DIM];
+ int i, j, k;
/* Initialize */
@@ -628,7 +628,7 @@
for ( i = 0; i < matPtr->len; i++ )
{
- j = i + 1;
+ j = i + 1;
matPtr->fdata[i] = 0.25 * ( tmp[j - 1] + 2 * tmp[j] + tmp[j + 1] );
}
}
Modified: trunk/bindings/tcl/tclMatrix.h
===================================================================
--- trunk/bindings/tcl/tclMatrix.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tcl/tclMatrix.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -348,8 +348,8 @@
typedef struct tclMatrixXtnsnDescr
{
- char *cmd;
- tclMatrixXtnsnProc cmdproc;
+ char *cmd;
+ tclMatrixXtnsnProc cmdproc;
struct tclMatrixXtnsnDescr *next;
} tclMatrixXtnsnDescr;
Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tk/plframe.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -362,7 +362,7 @@
Tk_Window new;
register PlFrame *plFramePtr;
register PLRDev *plr;
- int i, ndev;
+ int i, ndev;
dbug_enter( "plFrameCmd" );
@@ -512,9 +512,9 @@
int argc, const char **argv )
{
register PlFrame *plFramePtr = (PlFrame *) clientData;
- int result = TCL_OK;
- int length;
- char c;
+ int result = TCL_OK;
+ int length;
+ char c;
dbug_enter( "PlFrameWidgetCmd" );
@@ -1177,9 +1177,9 @@
register Tk_Window tkwin = plFramePtr->tkwin;
KeySym keysym;
- int nchars;
- char string[11];
- XComposeStatus cs;
+ int nchars;
+ char string[11];
+ XComposeStatus cs;
dbug_enter( "PlFrameKeyEH" );
@@ -1277,7 +1277,7 @@
{
register Tk_Window tkwin = plFramePtr->tkwin;
Window root, child;
- int root_x, root_y, win_x, win_y;
+ int root_x, root_y, win_x, win_y;
unsigned int mask;
/* Switch to crosshair cursor. */
@@ -1367,8 +1367,8 @@
DrawXhairs( PlFrame *plFramePtr, int x0, int y0 )
{
register Tk_Window tkwin = plFramePtr->tkwin;
- int xmin = 0, xmax = Tk_Width( tkwin ) - 1;
- int ymin = 0, ymax = Tk_Height( tkwin ) - 1;
+ int xmin = 0, xmax = Tk_Width( tkwin ) - 1;
+ int ymin = 0, ymax = Tk_Height( tkwin ) - 1;
if ( plFramePtr->drawing_xhairs )
UpdateXhairs( plFramePtr );
@@ -1413,7 +1413,7 @@
{
register Tk_Window tkwin = plFramePtr->tkwin;
Window root, child;
- int root_x, root_y, win_x, win_y;
+ int root_x, root_y, win_x, win_y;
unsigned int mask;
/* Find current pointer location, and initiate rubber banding. */
@@ -2231,7 +2231,7 @@
XwDisplay *xwd = (XwDisplay *) dev->xwd;
XGCValues gcValues;
unsigned long mask;
- int need_redisplay = 0;
+ int need_redisplay = 0;
#ifdef DEBUG
if ( pls->debug )
@@ -2273,7 +2273,7 @@
gcValues.background = xwd->cmap0[0].pixel;
gcValues.foreground = 0xFF;
gcValues.function = GXxor;
- mask = GCForeground | GCBackground | GCFunction;
+ mask = GCForeground | GCBackground | GCFunction;
if ( plFramePtr->xorGC != NULL )
Tk_FreeGC( plFramePtr->display, plFramePtr->xorGC );
@@ -2347,10 +2347,10 @@
Draw( Tcl_Interp *interp, register PlFrame *plFramePtr,
int argc, const char **argv )
{
- register Tk_Window tkwin = plFramePtr->tkwin;
- int result = TCL_OK;
- char c = argv[0][0];
- int length = strlen( argv[0] );
+ register Tk_Window tkwin = plFramePtr->tkwin;
+ int result = TCL_OK;
+ char c = argv[0][0];
+ int length = strlen( argv[0] );
/* Make sure widget has been initialized before going any further */
@@ -2511,8 +2511,8 @@
register PLRDev *plr = plFramePtr->plr;
register PLiodev *iodev = plr->iodev;
- char c = argv[0][0];
- int length = strlen( argv[0] );
+ char c = argv[0][0];
+ int length = strlen( argv[0] );
dbug_enter( "Openlink" );
@@ -2653,7 +2653,7 @@
{
register PLRDev *plr = plFramePtr->plr;
register PLiodev *iodev = plr->iodev;
- int result = TCL_OK;
+ int result = TCL_OK;
/* Process data */
@@ -2703,7 +2703,7 @@
register PLRDev *plr = plFramePtr->plr;
register PLiodev *iodev = plr->iodev;
register PDFstrm *pdfs = plr->pdfs;
- int result = TCL_OK;
+ int result = TCL_OK;
if ( mask & TK_READABLE )
{
Modified: trunk/bindings/tk/tcpip.c
===================================================================
--- trunk/bindings/tk/tcpip.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tk/tcpip.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -129,9 +129,9 @@
typedef struct PartialRead
{
- char *buffer; /* Buffer of characters */
- int bufSize; /* Size of buffer */
- int offset; /* Offset of current character within buffer */
+ char *buffer; /* Buffer of characters */
+ int bufSize; /* Size of buffer */
+ int offset; /* Offset of current character within buffer */
struct PartialRead *next; /* Next buffer in chain */
} PartialRead;
@@ -354,7 +354,7 @@
char **argv;
{
register struct hostent *hostptr;
- char hostname[100];
+ char hostname[100];
if ( gethostname( hostname, 100 ))
{
Modified: trunk/bindings/tk-x-plat/plplotter.c
===================================================================
--- trunk/bindings/tk-x-plat/plplotter.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/bindings/tk-x-plat/plplotter.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -351,7 +351,7 @@
Tk_Window tkwin;
register PlPlotter *plPlotterPtr;
register PLRDev *plr;
- int i, ndev;
+ int i, ndev;
dbug_enter( "plPlotterCmd" );
@@ -410,9 +410,9 @@
plPlotterPtr->SaveFnam = NULL;
plPlotterPtr->plr = (PLRDev *) malloc( sizeof ( PLRDev ));
- plr = plPlotterPtr->plr;
- plr->pdfs = NULL;
- plr->iodev = (PLiodev *) malloc( sizeof ( PLiodev ));
+ plr = plPlotterPtr->plr;
+ plr->pdfs = NULL;
+ plr->iodev = (PLiodev *) malloc( sizeof ( PLiodev ));
plr_start( plr );
/* Associate new PLplot stream with this widget */
@@ -491,9 +491,9 @@
int argc, CONST char **argv )
{
register PlPlotter *plPlotterPtr = (PlPlotter *) clientData;
- int result = TCL_OK;
- int length;
- char c;
+ int result = TCL_OK;
+ int length;
+ char c;
dbug_enter( "PlPlotterWidgetCmd" );
@@ -1141,7 +1141,7 @@
{
register Tk_Window tkwin = plPlotterPtr->tkwin;
Window root, child;
- int root_x, root_y, win_x, win_y;
+ int root_x, root_y, win_x, win_y;
unsigned int mask;
@@ -1193,8 +1193,8 @@
DrawXhairs( PlPlotter *plPlotterPtr, int x0, int y0 )
{
register Tk_Window tkwin = plPlotterPtr->tkwin;
- int xmin = 0, xmax = Tk_Width( tkwin ) - 1;
- int ymin = 0, ymax = Tk_Height( tkwin ) - 1;
+ int xmin = 0, xmax = Tk_Width( tkwin ) - 1;
+ int ymin = 0, ymax = Tk_Height( tkwin ) - 1;
if ( plPlotterPtr->drawing_xhairs )
UpdateXhairs( plPlotterPtr );
@@ -1239,7 +1239,7 @@
{
register Tk_Window tkwin = plPlotterPtr->tkwin;
Window root, child;
- int root_x, root_y, win_x, win_y;
+ int root_x, root_y, win_x, win_y;
unsigned int mask;
/* Find current pointer location, and initiate rubber banding. */
@@ -2038,7 +2038,7 @@
TkwDisplay *tkwd = (TkwDisplay *) dev->tkwd;
XGCValues gcValues;
unsigned long mask;
- int need_redisplay = 0;
+ int need_redisplay = 0;
#ifdef DEBUG
if ( pls->debug )
@@ -2085,7 +2085,7 @@
gcValues.background = tkwd->cmap0[0].pixel;
gcValues.foreground = 0xFF;
gcValues.function = GXxor;
- mask = GCForeground | GCBackground | GCFunction;
+ mask = GCForeground | GCBackground | GCFunction;
if ( plPlotterPtr->xorGC != NULL )
Tk_FreeGC( plPlotterPtr->display, plPlotterPtr->xorGC );
@@ -2175,10 +2175,10 @@
Draw( Tcl_Interp *interp, register PlPlotter *plPlotterPtr,
int argc, CONST char **argv )
{
- register Tk_Window tkwin = plPlotterPtr->tkwin;
- int result = TCL_OK;
- char c = argv[0][0];
- int length = strlen( argv[0] );
+ register Tk_Window tkwin = plPlotterPtr->tkwin;
+ int result = TCL_OK;
+ char c = argv[0][0];
+ int length = strlen( argv[0] );
/* Make sure widget has been initialized before going any further */
@@ -2340,8 +2340,8 @@
register PLRDev *plr = plPlotterPtr->plr;
register PLiodev *iodev = plr->iodev;
- char c = argv[0][0];
- int length = strlen( argv[0] );
+ char c = argv[0][0];
+ int length = strlen( argv[0] );
dbug_enter( "Openlink" );
@@ -2451,7 +2451,7 @@
{
register PLRDev *plr = plPlotterPtr->plr;
register PLiodev *iodev = plr->iodev;
- int result = TCL_OK;
+ int result = TCL_OK;
/* Process data */
@@ -2521,7 +2521,7 @@
register PLRDev *plr = plPlotterPtr->plr;
register PLiodev *iodev = plr->iodev;
register PDFstrm *pdfs = plr->pdfs;
- int result = TCL_OK;
+ int result = TCL_OK;
if ( mask & TK_READABLE )
{
Modified: trunk/drivers/aqt.c
===================================================================
--- trunk/drivers/aqt.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/aqt.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -48,19 +48,19 @@
/* local variables */
-static NSAutoreleasePool *arpool; /* Objective-C autorelease pool */
-static id adapter; /* Adapter object */
+static NSAutoreleasePool *arpool; /* Objective-C autorelease pool */
+static id adapter; /* Adapter object */
PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_aqt = "aqt:AquaTerm (Mac OS X):1:aqt:50:aqt\n";
-static int currentPlot = 0;
-static int maxWindows = 30;
-static int windowXSize = 0;
-static int windowYSize = 0;
+static int currentPlot = 0;
+static int maxWindows = 30;
+static int windowXSize = 0;
+static int windowYSize = 0;
-static bool didTests = false;
-static bool hasShear = false;
-static bool hasAlpha = false;
+static bool didTests = false;
+static bool hasShear = false;
+static bool hasAlpha = false;
/* font stuff */
@@ -528,9 +528,9 @@
void proc_str( PLStream *pls, EscText *args )
{
- PLFLT a1, ft_ht, angle, shear, stride;
- PLINT clxmin, clxmax, clymin, clymax;
- int i, jst, ref;
+ PLFLT a1, ft_ht, angle, shear, stride;
+ PLINT clxmin, clxmax, clymin, clymax;
+ int i, jst, ref;
NSMutableAttributedString *str;
/* check that we got unicode, warning message and return if not */
@@ -632,15 +632,15 @@
NSMutableAttributedString * create_string( const PLUNICODE *ucs4, int ucs4_len, PLFLT font_height )
{
- PLUNICODE fci;
- char plplot_esc;
- int i;
- int cur_loc;
- int utf8_len;
- int updown;
- char dummy[MAX_STRING_LEN + 1];
+ PLUNICODE fci;
+ char plplot_esc;
+ int i;
+ int cur_loc;
+ int utf8_len;
+ int updown;
+ char dummy[MAX_STRING_LEN + 1];
char *font;
- char utf8[5];
+ char utf8[5];
NSMutableAttributedString *str;
updown = 0;
@@ -649,7 +649,7 @@
for ( i = 0; i < MAX_STRING_LEN; i++ ) dummy[i] = 'i';
dummy[MAX_STRING_LEN] = '\0';
- str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithCString:dummy]];
+ str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithCString:dummy]];
/* get plplot escape character & current font */
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/cairo.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -607,8 +607,8 @@
void text_end_cairo( PLStream *pls, EscText *args )
{
- int textXExtent, textYExtent;
- PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear;
+ int textXExtent, textYExtent;
+ PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear;
cairo_matrix_t *cairoTransformMatrix;
cairo_font_options_t *cairoFontOptions;
PangoContext *context;
@@ -695,10 +695,10 @@
void proc_str( PLStream *pls, EscText *args )
{
- float fontSize;
- int textXExtent, textYExtent;
+ float fontSize;
+ int textXExtent, textYExtent;
char *textWithPangoMarkup;
- PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear;
+ PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear;
cairo_matrix_t *cairoTransformMatrix;
cairo_font_options_t *cairoFontOptions;
PangoContext *context;
@@ -1195,7 +1195,7 @@
void filled_polygon( PLStream *pls, short *xa, short *ya, PLINT npts )
{
- int i;
+ int i;
PLCairo *aStream;
cairo_line_join_t old_line_join;
cairo_line_cap_t old_line_cap;
@@ -1600,7 +1600,7 @@
switch ( event.type )
{
case KeyPress:
- number_chars = XLookupString((XKeyEvent *) &event, event_string, 10, &keysym, &cs );
+ number_chars = XLookupString((XKeyEvent *) &event, event_string, 10, &keysym, &cs );
event_string[number_chars] = '\0';
if ( keysym == XK_Return )
{
@@ -1749,7 +1749,7 @@
/* Get key pressed (if any) */
if ( event.type == KeyPress )
{
- number_chars = XLookupString((XKeyEvent *) &event, gin->string, 10, &keysym, &cs );
+ number_chars = XLookupString((XKeyEvent *) &event, gin->string, 10, &keysym, &cs );
gin->string[number_chars] = '\0';
switch ( keysym )
{
Modified: trunk/drivers/gd.c
===================================================================
--- trunk/drivers/gd.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/gd.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -444,7 +444,7 @@
init_freetype_lv1( pls );
- FT = (FT_Data *) pls->FT;
+ FT = (FT_Data *) pls->FT;
FT->want_smooth_text = smooth_text > 0 ? 1 : 0;
if (( dev->optimise == 0 ) && ( dev->palette == 0 ) && ( smooth_text != 0 ))
{
Modified: trunk/drivers/impress.c
===================================================================
--- trunk/drivers/impress.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/impress.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -145,8 +145,8 @@
/* Add both points to path */
- count = 0;
- FirstLine = 0;
+ count = 0;
+ FirstLine = 0;
*( LineBuff + count++ ) = x1;
*( LineBuff + count++ ) = y1;
*( LineBuff + count++ ) = x2;
@@ -175,7 +175,7 @@
fprintf( pls->OutFile, "%c%c", SET_PEN, (char) penwidth );
penchange = 0;
}
- count = 0;
+ count = 0;
*( LineBuff + count++ ) = x1;
*( LineBuff + count++ ) = y1;
*( LineBuff + count++ ) = x2;
Modified: trunk/drivers/ljii.c
===================================================================
--- trunk/drivers/ljii.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/ljii.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -320,7 +320,7 @@
setpoint( PLINT x, PLINT y )
{
PLINT index;
- index = x / 8 + y * BPROW;
+ index = x / 8 + y * BPROW;
*( bitmap + index ) = *( bitmap + index ) | mask[x % 8];
}
Modified: trunk/drivers/ljiip.c
===================================================================
--- trunk/drivers/ljiip.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/ljiip.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -353,7 +353,7 @@
void
plD_eop_ljiip( PLStream *pls )
{
- PLINT j;
+ PLINT j;
unsigned char _HUGE *p;
#if GCMODE > 0
int i, iy, last, n, jmax;
@@ -506,7 +506,7 @@
setpoint( PLINT x, PLINT y )
{
PLINT index;
- index = x / 8 + y * BPROW1;
+ index = x / 8 + y * BPROW1;
*( bitmap + index ) = *( bitmap + index ) | mask[x % 8];
}
Modified: trunk/drivers/mem.c
===================================================================
--- trunk/drivers/mem.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/mem.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -116,8 +116,8 @@
dx = ( x2 - x1 ) / length;
dy = ( y2 - y1 ) / length;
- fx = x1;
- fy = y1;
+ fx = x1;
+ fy = y1;
mem[3 * xm * y1 + 3 * x1 + 0] = pls->curcolor.r;
mem[3 * xm * y1 + 3 * x1 + 1] = pls->curcolor.g;
mem[3 * xm * y1 + 3 * x1 + 2] = pls->curcolor.b;
Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/ntk.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -479,9 +479,9 @@
void
plD_esc_ntk( PLStream *pls, PLINT op, void *ptr )
{
- PLINT i, j;
+ PLINT i, j;
short *xa, *ya;
- Pixmap bitmap;
+ Pixmap bitmap;
static unsigned char bit_pat[] = {
0x24, 0x01, 0x92, 0x00, 0x49, 0x00, 0x24, 0x00, 0x12, 0x00, 0x09, 0x00,
0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Modified: trunk/drivers/pbm.c
===================================================================
--- trunk/drivers/pbm.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/pbm.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -127,8 +127,8 @@
cmap[(int) y_off][(int) x_off][0] = pls->curcolor.r;
cmap[(int) y_off][(int) x_off][1] = pls->curcolor.g;
cmap[(int) y_off][(int) x_off][2] = pls->curcolor.b;
- x_off += dx_step;
- y_off += dy_step;
+ x_off += dx_step;
+ y_off += dy_step;
}
cmap[(int) y_off][(int) x_off][0] = pls->curcolor.r;
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/pdf.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -77,26 +77,26 @@
/* container for device specific data */
typedef struct
{
- HPDF_Doc pdf;
- HPDF_Page page;
- HPDF_PageSizes pageSize;
+ HPDF_Doc pdf;
+ HPDF_Page page;
+ HPDF_PageSizes pageSize;
FILE *pdfFile;
- PLFLT scalex, scaley;
+ PLFLT scalex, scaley;
/* font variables */
- HPDF_Font m_font;
- int nlookup;
+ HPDF_Font m_font;
+ int nlookup;
const Unicode_to_Type1_table *lookup;
- HPDF_REAL fontSize;
- HPDF_REAL fontScale;
- HPDF_REAL textWidth, textHeight;
- HPDF_REAL yOffset;
- HPDF_REAL textRed, textGreen, textBlue;
+ HPDF_REAL fontSize;
+ HPDF_REAL fontScale;
+ HPDF_REAL textWidth, textHeight;
+ HPDF_REAL yOffset;
+ HPDF_REAL textRed, textGreen, textBlue;
} pdfdev;
/* local variables */
PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_pdf = "pdf:Portable Document Format PDF:1:pdf:58:pdf\n";
-static jmp_buf env;
+static jmp_buf env;
/***********************************************************************
* function declarations
Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/ps.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -719,9 +719,9 @@
time_t t;
char *p;
- t = time((time_t *) 0 );
- p = ctime( &t );
- len = strlen( p );
+ t = time((time_t *) 0 );
+ p = ctime( &t );
+ len = strlen( p );
*( p + len - 1 ) = '\0'; /* zap the newline character */
return p;
}
@@ -760,12 +760,12 @@
/* unicode only! so test for it. */
if ( args->unicode_array_len > 0 )
{
- int j, s, f;
+ int j, s, f;
char *fonts[PROC_STR_STRING_LENGTH];
- int nlookup;
+ int nlookup;
const Unicode_to_Type1_table *lookup;
const PLUNICODE *cur_text;
- PLUNICODE fci;
+ PLUNICODE fci;
/* translate from unicode into type 1 font index. */
/*
* Choose the font family, style, variant, and weight using
Modified: trunk/drivers/qt.cpp
===================================================================
--- trunk/drivers/qt.cpp 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/qt.cpp 2009-10-26 13:55:52 UTC (rev 10552)
@@ -699,7 +699,7 @@
bool isMaster = ( handler.isMasterDevice((QtSVGDevice *) pls->dev ));
delete ((QtSVGDevice *) pls->dev );
- pls->dev = new QtSVGDevice( s.width(), s.height());
+ pls->dev = new QtSVGDevice( s.width(), s.height());
((QtSVGDevice *) pls->dev )->downscale = downscale;
if ( isMaster ) handler.setMasterDevice((QtSVGDevice *) pls->dev );
@@ -943,7 +943,7 @@
bool isMaster = handler.isMasterDevice((QtEPSDevice *) pls->dev );
delete ((QtEPSDevice *) pls->dev );
- pls->dev = new QtEPSDevice;
+ pls->dev = new QtEPSDevice;
((QtEPSDevice *) pls->dev )->downscale = downscale;
if ( isMaster ) handler.setMasterDevice((QtEPSDevice *) pls->dev );
Modified: trunk/drivers/svg.c
===================================================================
--- trunk/drivers/svg.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/svg.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -54,10 +54,10 @@
PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_svg = "svg:Scalable Vector Graphics (SVG 1.1):1:svg:57:svg\n";
-static int already_warned = 0;
+static int already_warned = 0;
-static int text_clipping = 1;
-static DrvOpt svg_options[] = { { "text_clipping", DRV_INT, &text_clipping, "Use text clipping (text_clipping=0|1)" } };
+static int text_clipping = 1;
+static DrvOpt svg_options[] = { { "text_clipping", DRV_INT, &text_clipping, "Use text clipping (text_clipping=0|1)" } };
typedef struct
{
Modified: trunk/drivers/tkwin.c
===================================================================
--- trunk/drivers/tkwin.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/tkwin.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -925,7 +925,7 @@
gcValues.background = tkwd->cmap0[0].pixel;
gcValues.foreground = 0xFF;
gcValues.function = GXxor;
- mask = GCForeground | GCBackground | GCFunction;
+ mask = GCForeground | GCBackground | GCFunction;
tkwd->gcXor = XCreateGC( tkwd->display, dev->window, mask, &gcValues );
}
@@ -945,7 +945,7 @@
if ( pls->nopixmap )
{
dev->write_to_pixmap = 0;
- pls->db = 0;
+ pls->db = 0;
}
else
{
@@ -1245,7 +1245,7 @@
{
dev->write_to_pixmap = 0;
dev->write_to_window = 1;
- pls->db = 0;
+ pls->db = 0;
fprintf( stderr, "\n\
Warning: pixmap could not be allocated (insufficient memory on server).\n\
Driver will redraw the entire plot to handle expose events.\n" );
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/wingcc.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -576,7 +576,7 @@
pls->dev_text = 1; /* want to draw text */
pls->dev_unicode = 1; /* want unicode */
init_freetype_lv1( pls );
- FT = (FT_Data *) pls->FT;
+ FT = (FT_Data *) pls->FT;
FT->want_smooth_text = smooth_text;
}
Modified: trunk/drivers/wxwidgets.h
===================================================================
--- trunk/drivers/wxwidgets.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/wxwidgets.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -93,11 +93,11 @@
virtual ~wxPLDevBase( void );
// virtual functions which need to implemented
- virtual void DrawLine( short x1a, short y1a, short x2a, short y2a ) = 0;
- virtual void DrawPolyline( short *xa, short *ya, PLINT npts ) = 0;
+ virtual void DrawLine( short x1a, short y1a, short x2a, short y2a ) = 0;
+ virtual void DrawPolyline( short *xa, short *ya, PLINT npts ) = 0;
virtual void ClearBackground( PLINT bgr, PLINT bgg, PLINT bgb, PLINT x1 = -1, PLINT y1 = -1, PLINT x2 = -1, PLINT y2 = -1 ) = 0;
- virtual void FillPolygon( PLStream *pls ) = 0;
- virtual void BlitRectangle( wxDC* dc, int vX, int vY, int vW, int vH ) = 0;
+ virtual void FillPolygon( PLStream *pls ) = 0;
+ virtual void BlitRectangle( wxDC* dc, int vX, int vY, int vW, int vH ) = 0;
void AddtoClipRegion( int x1, int y1, int x2, int y2 );
virtual void CreateCanvas() = 0;
virtual void SetWidth( PLStream *pls ) = 0;
@@ -106,13 +106,13 @@
virtual void SetExternalBuffer( void* buffer ) = 0;
#ifdef HAVE_FREETYPE
virtual void PutPixel( short x, short y, PLINT color ) = 0;
- virtual void PutPixel( short x, short y ) = 0;
- virtual PLINT GetPixel( short x, short y ) = 0;
+ virtual void PutPixel( short x, short y ) = 0;
+ virtual PLINT GetPixel( short x, short y ) = 0;
#endif // HAVE_FREETYPE
virtual void ProcessString( PLStream* pls, EscText* args ) = 0;
virtual void PSDrawText( PLUNICODE* ucs4, int ucs4Len, bool drawText );
virtual void PSDrawTextToDC( char* utf8_string, bool drawText ) = 0;
- virtual void PSSetFont( PLUNICODE fci ) = 0;
+ virtual void PSSetFont( PLUNICODE fci ) = 0;
public: /* variables */
const int backend;
@@ -268,39 +268,39 @@
void AGGAddtoClipRegion( short x1, short y1, short x2, short y2 );
private: /* variables */
- wxDC * mDC;
- wxImage * mBuffer;
- agg::rendering_buffer mRenderingBuffer;
- fontEngineType mFontEngine;
- fontManagerType mFontManager;
- agg::conv_curve<fontManagerType::path_adaptor_type> mCurves;
+ wxDC * mDC;
+ wxImage * mBuffer;
+ agg::rendering_buffer mRenderingBuffer;
+ fontEngineType mFontEngine;
+ fontManagerType mFontManager;
+ agg::conv_curve<fontManagerType::path_adaptor_type> mCurves;
agg::conv_contour<agg::conv_curve<fontManagerType::path_adaptor_type> > mContour;
- pixFormat mPixFormat;
- rendererBase mRendererBase;
- rendererSolid mRendererSolid;
+ pixFormat mPixFormat;
+ rendererBase mRendererBase;
+ rendererSolid mRendererSolid;
- agg::scanline_u8 mScanLine;
+ agg::scanline_u8 mScanLine;
agg::rasterizer_scanline_aa<> mRasterizer;
- agg::path_storage mPath;
- agg::trans_affine mTransform;
+ agg::path_storage mPath;
+ agg::trans_affine mTransform;
- convCurve mConvCurve;
- convStroke mConvStroke;
- pathTransform mPathTransform;
- strokeTransform mStrokeTransform;
+ convCurve mConvCurve;
+ convStroke mConvStroke;
+ pathTransform mPathTransform;
+ strokeTransform mStrokeTransform;
- double mStrokeWidth;
- wxUint8 mStrokeOpacity;
- unsigned char mColorRedStroke;
- unsigned char mColorGreenStroke;
- unsigned char mColorBlueStroke;
- unsigned char mColorRedFill;
- unsigned char mColorGreenFill;
- unsigned char mColorBlueFill;
+ double mStrokeWidth;
+ wxUint8 mStrokeOpacity;
+ unsigned char mColorRedStroke;
+ unsigned char mColorGreenStroke;
+ unsigned char mColorBlueStroke;
+ unsigned char mColorRedFill;
+ unsigned char mColorGreenFill;
+ unsigned char mColorBlueFill;
- double textWidth, textHeight;
- wxString fontdir;
+ double textWidth, textHeight;
+ wxString fontdir;
};
#endif
@@ -384,8 +384,8 @@
void OnIdle( wxIdleEvent& event );
private:
- bool exit;
- bool advance;
+ bool exit;
+ bool advance;
wxArrayOfwxPLplotFrame FrameArray;
DECLARE_EVENT_TABLE()
Modified: trunk/drivers/wxwidgets_app.cpp
===================================================================
--- trunk/drivers/wxwidgets_app.cpp 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/wxwidgets_app.cpp 2009-10-26 13:55:52 UTC (rev 10552)
@@ -480,7 +480,7 @@
wxPaintDC dc( this );
/* only update damaged regions */
- int vX, vY, vW, vH;
+ int vX, vY, vW, vH;
wxRegionIterator upd( GetUpdateRegion());
// remove the xhair before updating
Modified: trunk/drivers/xfig.c
===================================================================
--- trunk/drivers/xfig.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/xfig.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -251,12 +251,12 @@
if ( dev->firstline )
{
- count = 0;
+ count = 0;
*( dev->buffptr + count++ ) = x1;
*( dev->buffptr + count++ ) = y1;
*( dev->buffptr + count++ ) = x2;
*( dev->buffptr + count++ ) = y2;
- dev->firstline = 0;
+ dev->firstline = 0;
}
else if ( x1 == dev->xold && y1 == dev->yold )
{
@@ -279,7 +279,7 @@
else
{
flushbuffer( pls );
- count = dev->count;
+ count = dev->count;
*( dev->buffptr + count++ ) = x1;
*( dev->buffptr + count++ ) = y1;
*( dev->buffptr + count++ ) = x2;
Modified: trunk/drivers/xwin.c
===================================================================
--- trunk/drivers/xwin.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/drivers/xwin.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -47,7 +47,7 @@
/* Device info */
PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_xwin = "xwin:X-Window (Xlib):1:xwin:5:xw\n";
-static int synchronize = 0; /* change to 1 for X synchronized operation */
+static int synchronize = 0; /* change to 1 for X synchronized operation */
/* Use "-drvopt sync" cmd line option to set. */
static int nobuffered = 0; /* make it a buffered device by default */
@@ -1063,7 +1063,7 @@
gcValues.background = xwd->cmap0[0].pixel;
gcValues.foreground = 0xFF;
gcValues.function = GXxor;
- mask = GCForeground | GCBackground | GCFunction;
+ mask = GCForeground | GCBackground | GCFunction;
xwd->gcXor = XCreateGC( xwd->display, dev->window, mask, &gcValues );
}
@@ -1082,7 +1082,7 @@
if ( pls->nopixmap )
{
dev->write_to_pixmap = 0;
- pls->db = 0;
+ pls->db = 0;
}
else
{
@@ -1553,7 +1553,7 @@
gin->state = keyEvent->state;
- nchars = XLookupString( keyEvent, gin->string, ncmax, &keysym, &cs );
+ nchars = XLookupString( keyEvent, gin->string, ncmax, &keysym, &cs );
gin->string[nchars] = '\0';
pldebug( "LookupXKeyEvent",
@@ -2338,12 +2338,12 @@
{
case PLESC_DOUBLEBUFFERING_ENABLE:
dev->write_to_window = 0;
- pls->db = 1;
+ pls->db = 1;
break;
case PLESC_DOUBLEBUFFERING_DISABLE:
dev->write_to_window = 1;
- pls->db = 0;
+ pls->db = 0;
break;
case PLESC_DOUBLEBUFFERING_QUERY:
@@ -2453,7 +2453,7 @@
{
dev->write_to_pixmap = 0;
dev->write_to_window = 1;
- pls->db = 0;
+ pls->db = 0;
fprintf( stderr, "\n\
Warning: pixmap could not be allocated (insufficient memory on server).\n\
Driver will redraw the entire plot to handle expose events.\n" );
Modified: trunk/examples/c/x16c.c
===================================================================
--- trunk/examples/c/x16c.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c/x16c.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -358,7 +358,7 @@
r = ((PLFLT) i ) / ( nx - 1 );
for ( j = 0; j < ny; j++ )
{
- t = ( 2. * M_PI / ( ny - 1. )) * j;
+ t = ( 2. * M_PI / ( ny - 1. )) * j;
cgrid2.xg[i][j] = r * cos( t );
cgrid2.yg[i][j] = r * sin( t );
z[i][j] = exp( -r * r ) * cos( 5. * M_PI * r ) * cos( 5. * t );
Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c/x20c.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -80,7 +80,7 @@
mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data )
{
struct stretch_data *s = (struct stretch_data *) pltr_data;
- PLFLT x0, y0, dy;
+ PLFLT x0, y0, dy;
x0 = ( s->xmin + s->xmax ) * 0.5;
y0 = ( s->ymin + s->ymax ) * 0.5;
dy = ( s->ymax - s->ymin ) * 0.5;
Modified: trunk/examples/c/x22c.c
===================================================================
--- trunk/examples/c/x22c.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c/x22c.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -73,7 +73,7 @@
x = ( i - nx / 2 + 0.5 ) * dx;
for ( j = 0; j < ny; j++ )
{
- y = ( j - ny / 2 + 0.5 ) * dy;
+ y = ( j - ny / 2 + 0.5 ) * dy;
cgrid2.xg[i][j] = x;
cgrid2.yg[i][j] = y;
u[i][j] = y;
@@ -131,10 +131,10 @@
x = ( i - nx / 2 + 0.5 ) * dx;
for ( j = 0; j < ny; j++ )
{
- y = ( j - ny / 2 + 0.5 ) * dy;
+ 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 ));
+ b = ymax / 4.0 * ( 3 - cos( M_PI * x / xmax ));
if ( fabs( y ) < b )
{
dbdx = ymax / 4.0 * sin( M_PI * x / xmax ) *
Modified: trunk/examples/c++/x01cc.cc
===================================================================
--- trunk/examples/c++/x01cc.cc 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c++/x01cc.cc 2009-10-26 13:55:52 UTC (rev 10552)
@@ -215,8 +215,8 @@
ContourableMatrix d( 64, 64, 1 );
CoordinateMatrix xg( 64, 64, 1 ), yg( 64, 64, 1 );
- int i, j;
- PLFLT twopi = 2. * 3.1415927;
+ int i, j;
+ PLFLT twopi = 2. * 3.1415927;
// Set up the data and coordinate matrices.
Modified: trunk/examples/c++/x12.cc
===================================================================
--- trunk/examples/c++/x12.cc 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c++/x12.cc 2009-10-26 13:55:52 UTC (rev 10552)
@@ -35,7 +35,7 @@
class x12 {
public:
x12( int, const char** );
- void plfbox( PLFLT, PLFLT );
+ void plfbox( PLFLT, PLFLT );
private:
plstream *pls;
Modified: trunk/examples/c++/x16.cc
===================================================================
--- trunk/examples/c++/x16.cc 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c++/x16.cc 2009-10-26 13:55:52 UTC (rev 10552)
@@ -360,7 +360,7 @@
r = ((PLFLT) i ) / ( nx - 1 );
for ( j = 0; j < ny; j++ )
{
- t = ( 2. * M_PI / ( ny - 1. )) * j;
+ t = ( 2. * M_PI / ( ny - 1. )) * j;
cgrid2.xg[i][j] = r * cos( t );
cgrid2.yg[i][j] = r * sin( t );
z[i][j] = exp( -r * r ) * cos( 5. * M_PI * r ) * cos( 5. * t );
Modified: trunk/examples/c++/x20.cc
===================================================================
--- trunk/examples/c++/x20.cc 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c++/x20.cc 2009-10-26 13:55:52 UTC (rev 10552)
@@ -123,7 +123,7 @@
mypltr( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data )
{
struct stretch_data *s = (struct stretch_data *) pltr_data;
- PLFLT x0, y0, dy;
+ PLFLT x0, y0, dy;
x0 = ( s->xmin + s->xmax ) * 0.5;
y0 = ( s->ymin + s->ymax ) * 0.5;
dy = ( s->ymax - s->ymin ) * 0.5;
@@ -133,7 +133,7 @@
x20::x20( int argc, const char ** argv )
{
- PLFLT *x = new PLFLT[XDIM];
+ PLFLT *x = new PLFLT[XDIM];
PLFLT *y = new PLFLT[YDIM];
PLFLT **z, **r;
PLFLT xi, yi, xe, ye;
Modified: trunk/examples/c++/x22.cc
===================================================================
--- trunk/examples/c++/x22.cc 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/examples/c++/x22.cc 2009-10-26 13:55:52 UTC (rev 10552)
@@ -74,8 +74,8 @@
{
for ( j = 0; j < ny; j++ )
{
- x = ( i - nx / 2 + 0.5 ) * dx;
- y = ( j - ny / 2 + 0.5 ) * dy;
+ x = ( i - nx / 2 + 0.5 ) * dx;
+ y = ( j - ny / 2 + 0.5 ) * dy;
cgrid2.xg[i][j] = x;
cgrid2.yg[i][j] = y;
u[i][j] = y;
@@ -113,11 +113,11 @@
{
for ( j = 0; j < ny; j++ )
{
- x = ( i - nx / 2 + 0.5 ) * dx;
- y = ( j - ny / 2 + 0.5 ) * dy;
+ x = ( i - nx / 2 + 0.5 ) * dx;
+ 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 ));
+ b = ymax / 4.0 * ( 3 - cos( M_PI * x / xmax ));
if ( fabs( y ) < b )
{
dbdx = ymax / 4.0 * sin( M_PI * x / xmax ) *
Modified: trunk/include/plfreetype.h
===================================================================
--- trunk/include/plfreetype.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/include/plfreetype.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -111,9 +111,9 @@
plD_read_pixel_fp read_pixel; /* pointer to a function which reads the RGB value of a pixel and returns it*/
- int want_smooth_text; /* flag to request text smoothing (won't */
+ int want_smooth_text; /* flag to request text smoothing (won't */
/* necessarily get it though */
- int smooth_text; /* Flag to indicate type of anti-aliasing used, if freetype text is active */
+ int smooth_text; /* Flag to indicate type of anti-aliasing used, if freetype text is active */
/*
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/include/plplotP.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -418,7 +418,7 @@
char Font;
} Hershey_to_Unicode_table;
-extern int number_of_entries_in_hershey_to_unicode_table;
+extern int number_of_entries_in_hershey_to_unicode_table;
extern Hershey_to_Unicode_table hershey_to_unicode_lookup_table[];
@@ -646,8 +646,8 @@
typedef struct cont_level
{
- PLFLT level;
- struct cont_line *line; /* contour line */
+ PLFLT level;
+ struct cont_line *line; /* contour line */
struct cont_level *next; /* contour level */
} CONT_LEVEL;
Modified: trunk/include/plunicode-type1.h
===================================================================
--- trunk/include/plunicode-type1.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/include/plunicode-type1.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -30,7 +30,7 @@
unsigned char Type1;
} Unicode_to_Type1_table;
-static const int number_of_entries_in_unicode_to_dingbats_table = 188;
+static const int number_of_entries_in_unicode_to_dingbats_table = 188;
static const Unicode_to_Type1_table unicode_to_dingbats_lookup_table[188] = {
{ 0x0020, 32 },
@@ -223,7 +223,7 @@
{ 0x27be, 254 }
};
-static const int number_of_entries_in_unicode_to_standard_table = 149;
+static const int number_of_entries_in_unicode_to_standard_table = 149;
static const Unicode_to_Type1_table unicode_to_standard_lookup_table[149] = {
{ 0x0020, 32 },
@@ -377,7 +377,7 @@
{ 0xfb02, 175 }
};
-static const int number_of_entries_in_unicode_to_symbol_table = 166;
+static const int number_of_entries_in_unicode_to_symbol_table = 166;
static const Unicode_to_Type1_table unicode_to_symbol_lookup_table[166] = {
{ 0x0020, 32 },
Modified: trunk/include/qt.h
===================================================================
--- trunk/include/qt.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/include/qt.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -267,13 +267,13 @@
union DataType
{
- QLineF * Line;
+ QLineF * Line;
QPolygonF * Polyline;
QRectF * Rect;
struct ColourStruct_* ColourStruct;
struct TextStruct_ * TextStruct;
- PLINT intParam;
- PLFLT fltParam;
+ PLINT intParam;
+ PLFLT fltParam;
} Data;
};
@@ -316,8 +316,8 @@
void resetPensAndBrushes( QPainter* );
- double m_dAspectRatio; // Is kept constant during resizes
- QPixmap * m_pixPixmap; // stores the drawn image as long as it does not have to be regenerated
+ double m_dAspectRatio; // Is kept constant during resizes
+ QPixmap * m_pixPixmap; // stores the drawn image as long as it does not have to be regenerated
QLinkedList<BufferElement> m_listBuffer; // Buffer holding the draw instructions
// bool m_bAwaitingRedraw;
Modified: trunk/lib/csa/csa.c
===================================================================
--- trunk/lib/csa/csa.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/csa/csa.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -2162,13 +2162,13 @@
int nout = 0;
int generate_points = 0;
point * pout = NULL;
- int nx = -1;
- int ny = -1;
- csa * a = NULL;
- int nppc = -1;
- int k = -1;
- double ks = NaN;
- double zoom = NaN;
+ int nx = -1;
+ int ny = -1;
+ csa * a = NULL;
+ int nppc = -1;
+ int k = -1;
+ double ks = NaN;
+ double zoom = NaN;
parse_commandline( argc, argv, &fdata, &fpoints, &invariant, &square, &generate_points, &nx, &ny, &nppc, &k, &zoom );
Modified: trunk/lib/nistcd/cd.c
===================================================================
--- trunk/lib/nistcd/cd.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nistcd/cd.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -217,10 +217,10 @@
unsigned char *headerp;
unsigned char *head;
const unsigned char *buf, *buf2;
- int octet_count = 0;
- int blen; /* length of buf */
- int curly;
- int fontlistlen; /* each font in the font list is stored as a string,
+ int octet_count = 0;
+ int blen; /* length of buf */
+ int curly;
+ int fontlistlen; /* each font in the font list is stored as a string,
* with a single octet in front of the string
* giving its length, fontlistlen is the sum of
* the lengths of all the font strings + the
Modified: trunk/lib/nn/delaunay.c
===================================================================
--- trunk/lib/nn/delaunay.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nn/delaunay.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -67,14 +67,14 @@
tio->segmentlist = 0;
tio->segmentmarkerlist = NULL;
tio->numberofsegments = 0;
- tio->holelist = NULL;
- tio->numberofholes = 0;
- tio->regionlist = NULL;
- tio->numberofregions = 0;
- tio->edgelist = NULL;
- tio->edgemarkerlist = NULL;
- tio->normlist = NULL;
- tio->numberofedges = 0;
+ tio->holelist = NULL;
+ tio->numberofholes = 0;
+ tio->regionlist = NULL;
+ tio->numberofregions = 0;
+ tio->edgelist = NULL;
+ tio->edgemarkerlist = NULL;
+ tio->normlist = NULL;
+ tio->numberofedges = 0;
}
static void tio_destroy( struct triangulateio* tio )
@@ -187,10 +187,10 @@
fprintf( stderr, "triangles:\n" );
for ( i = 0; i < d->ntriangles; ++i )
{
- int offset = i * 3;
- triangle * t = &d->triangles[i];
- triangle_neighbours* n = &d->neighbours[i];
- circle * c = &d->circles[i];
+ int offset = i * 3;
+ triangle * t = &d->triangles[i];
+ triangle_neighbours* n = &d->neighbours[i];
+ circle * c = &d->circles[i];
t->vids[0] = tio_out->trianglelist[offset];
t->vids[1] = tio_out->trianglelist[offset + 1];
@@ -262,8 +262,8 @@
delaunay * d = delaunay_create();
struct triangulateio tio_in;
struct triangulateio tio_out;
- char cmd[64] = "eznC";
- int i, j;
+ char cmd[64] = "eznC";
+ int i, j;
assert( sizeof ( REAL ) == sizeof ( double ));
Modified: trunk/lib/nn/delaunay.h
===================================================================
--- trunk/lib/nn/delaunay.h 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nn/delaunay.h 2009-10-26 13:55:52 UTC (rev 10552)
@@ -44,14 +44,14 @@
struct delaunay
{
- int npoints;
+ int npoints;
point * points;
- double xmin;
- double xmax;
- double ymin;
- double ymax;
+ double xmin;
+ double xmax;
+ double ymin;
+ double ymax;
- int ntriangles;
+ int ntriangles;
triangle * triangles;
circle * circles;
triangle_neighbours* neighbours; /* for delaunay_xytoi() */
Modified: trunk/lib/nn/hash.c
===================================================================
--- trunk/lib/nn/hash.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nn/hash.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -25,9 +25,9 @@
*/
typedef struct ht_bucket
{
- void * key;
+ void * key;
void * data;
- int id; /* unique id -- just in case */
+ int id; /* unique id -- just in case */
struct ht_bucket* next;
} ht_bucket;
Modified: trunk/lib/nn/nnai.c
===================================================================
--- trunk/lib/nn/nnai.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nn/nnai.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -214,9 +214,9 @@
int main( int argc, char* argv[] )
{
- int nin = NPOINTSIN;
- int nx = NX;
- int nout = 0;
+ int nin = NPOINTSIN;
+ int nx = NX;
+ int nout = 0;
point * pin = NULL;
delaunay * d = NULL;
point * pout = NULL;
Modified: trunk/lib/nn/nnpi.c
===================================================================
--- trunk/lib/nn/nnpi.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/nn/nnpi.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -664,9 +664,9 @@
int main( int argc, char* argv[] )
{
- int nin = NPOINTSIN;
- int nx = NX;
- int nout = 0;
+ int nin = NPOINTSIN;
+ int nx = NX;
+ int nout = 0;
point * pin = NULL;
delaunay * d = NULL;
point * pout = NULL;
Modified: trunk/lib/qsastime/tai-utc-gen.c
===================================================================
--- trunk/lib/qsastime/tai-utc-gen.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/lib/qsastime/tai-utc-gen.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -84,7 +84,7 @@
double *slope = NULL;
double sec, *leap_sec = NULL;
int jd;
- int i = 0;
+ int i = 0;
int number_of_lines = 0;
if (( fr = fopen( argv[1], "r" )) == NULL )
Modified: trunk/src/ltdl_win32.c
===================================================================
--- trunk/src/ltdl_win32.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/src/ltdl_win32.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -73,7 +73,7 @@
}
dlhandle->previousHandle = lastHandle;
- lastHandle = dlhandle;
+ lastHandle = dlhandle;
return dlhandle;
}
@@ -101,7 +101,7 @@
buffer[0] = '_';
strncpy( &buffer[1], symbol, bufferLength - 2 );
buffer[bufferLength - 1] = '\0';
- retPointer = GetProcAddress( dlhandle->hinstLib, buffer );
+ retPointer = GetProcAddress( dlhandle->hinstLib, buffer );
free( buffer );
return retPointer;
#else
Modified: trunk/src/pdfutils.c
===================================================================
--- trunk/src/pdfutils.c 2009-10-26 13:47:26 UTC (rev 10551)
+++ trunk/src/pdfutils.c 2009-10-26 13:55:52 UTC (rev 10552)
@@ -271,7 +271,7 @@
}
}
pdfs->buffer[pdfs->bp++] = c;
- result = c;
+ resu...
[truncated message content] |
