From: <and...@us...> - 2011-08-03 14:20:46
|
Revision: 11845 http://plplot.svn.sourceforge.net/plplot/?rev=11845&view=rev Author: andrewross Date: 2011-08-03 14:20:40 +0000 (Wed, 03 Aug 2011) Log Message: ----------- Revert previous workaround to plarc fill problem. Instead properly fix up plfill to avoid trying to free an array which was not allocated with malloc. Modified Paths: -------------- trunk/src/plarc.c trunk/src/plfill.c Modified: trunk/src/plarc.c =================================================================== --- trunk/src/plarc.c 2011-08-03 12:55:38 UTC (rev 11844) +++ trunk/src/plarc.c 2011-08-03 14:20:40 UTC (rev 11845) @@ -21,7 +21,7 @@ #include "plplotP.h" -#define CIRCLE_SEGMENTS ( PL_MAXPOLY - 2 ) +#define CIRCLE_SEGMENTS ( PL_MAXPOLY - 1 ) #define DEG_TO_RAD( x ) ( ( x ) * M_PI / 180.0 ) //-------------------------------------------------------------------------- Modified: trunk/src/plfill.c =================================================================== --- trunk/src/plfill.c 2011-08-03 12:55:38 UTC (rev 11844) +++ trunk/src/plfill.c 2011-08-03 14:20:40 UTC (rev 11845) @@ -181,7 +181,7 @@ plP_plfclp( xpoly, ypoly, n, plsc->clpxmi, plsc->clpxma, plsc->clpymi, plsc->clpyma, plP_fill ); - if ( n > PL_MAXPOLY - 1 ) + if ( xpoly != _xpoly ) { free( xpoly ); free( ypoly ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-10-27 23:19:48
|
Revision: 12006 http://plplot.svn.sourceforge.net/plplot/?rev=12006&view=rev Author: andrewross Date: 2011-10-27 23:19:42 +0000 (Thu, 27 Oct 2011) Log Message: ----------- Either remove or marked with the UNUSED macro function parameters which are not used. Modified Paths: -------------- trunk/src/pdfutils.c trunk/src/plbox.c trunk/src/plbuf.c trunk/src/plcont.c trunk/src/plcore.c trunk/src/plcvt.c trunk/src/plfill.c trunk/src/plfreetype.c trunk/src/plmap.c trunk/src/plot3d.c trunk/src/plshade.c Modified: trunk/src/pdfutils.c =================================================================== --- trunk/src/pdfutils.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/pdfutils.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -970,7 +970,7 @@ //-------------------------------------------------------------------------- void -plFree2dGrid( PLFLT **f, PLINT nx, PLINT ny ) +plFree2dGrid( PLFLT **f, PLINT nx, PLINT UNUSED( ny ) ) { PLINT i; Modified: trunk/src/plbox.c =================================================================== --- trunk/src/plbox.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plbox.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -782,7 +782,7 @@ static void plxybx( const char *opt, const char *label, PLINT axis, PLFLT wx1, PLFLT wy1, PLFLT wx2, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, - PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ) + PLFLT tick, PLINT nsub, PLINT UNUSED( nolast ), PLINT *digits ) { static char string[STRING_LEN]; PLINT lb, ld, lf, li, ll, ln, ls, lt, lu, lo; @@ -2369,13 +2369,13 @@ // potential exposure in the PLplot API. // //-------------------------------------------------------------------------- -void plP_default_label_log( PLINT axis, PLFLT value, char *string, PLINT len, void *data ) +void plP_default_label_log( PLINT UNUSED( axis ), PLFLT value, char *string, PLINT len, void * UNUSED( data ) ) { // Exponential, i.e. 10^-1, 10^0, 10^1, etc snprintf( string, (size_t) len, "10#u%d", (int) ROUND( value ) ); } -void plP_default_label_log_fixed( PLINT axis, PLFLT value, char *string, PLINT len, void *data ) +void plP_default_label_log_fixed( PLINT UNUSED( axis ), PLFLT value, char *string, PLINT len, void * UNUSED( data ) ) { // Fixed point, i.e. .1, 1, 10, etc @@ -2394,7 +2394,7 @@ } } -void plP_default_label( PLINT axis, PLFLT value, char *string, PLINT len, void *data ) +void plP_default_label( PLINT UNUSED( axis ), PLFLT value, char *string, PLINT len, void *data ) { PLINT scale, prec; PLINT setpre, precis; Modified: trunk/src/plbuf.c =================================================================== --- trunk/src/plbuf.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plbuf.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -126,7 +126,7 @@ //-------------------------------------------------------------------------- void -plbuf_eop( PLStream *pls ) +plbuf_eop( PLStream * UNUSED( pls ) ) { dbug_enter( "plbuf_eop" ); } @@ -186,7 +186,7 @@ //-------------------------------------------------------------------------- void -plbuf_tidy( PLStream *pls ) +plbuf_tidy( PLStream * UNUSED( pls ) ) { dbug_enter( "plbuf_tidy" ); @@ -456,7 +456,7 @@ //-------------------------------------------------------------------------- static void -rdbuf_init( PLStream *pls ) +rdbuf_init( PLStream * UNUSED( pls ) ) { dbug_enter( "rdbuf_init" ); } @@ -534,7 +534,7 @@ //-------------------------------------------------------------------------- static void -rdbuf_eop( PLStream *pls ) +rdbuf_eop( PLStream * UNUSED( pls ) ) { dbug_enter( "rdbuf_eop" ); } Modified: trunk/src/plcont.c =================================================================== --- trunk/src/plcont.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plcont.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -105,7 +105,7 @@ static int cont3d = 0; static CONT_LINE * -alloc_line( CONT_LEVEL *node ) +alloc_line( void ) { CONT_LINE *line; @@ -139,7 +139,7 @@ } node->level = level; node->next = NULL; - node->line = alloc_line( node ); + node->line = alloc_line( ); return node; } @@ -236,7 +236,7 @@ { if ( currline->npts != 0 ) // not an empty list, allocate new { - currline->next = alloc_line( currlev ); + currline->next = alloc_line( ); currline = currline->next; } @@ -865,7 +865,7 @@ //-------------------------------------------------------------------------- void -pltr0( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data ) +pltr0( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer UNUSED( pltr_data ) ) { *tx = x; *ty = y; Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plcore.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -1263,7 +1263,7 @@ } static void -grline( short *x, short *y, PLINT npts ) +grline( short *x, short *y, PLINT UNUSED( npts ) ) { char *save_locale = plsave_set_locale(); if ( !plsc->stream_closed ) Modified: trunk/src/plcvt.c =================================================================== --- trunk/src/plcvt.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plcvt.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -211,7 +211,7 @@ // See c_plw3d for a mathematical explanation of the transformation. PLFLT -plP_w3wcx( PLFLT x, PLFLT y, PLFLT z ) +plP_w3wcx( PLFLT x, PLFLT y, PLFLT UNUSED( z ) ) { return ( (PLFLT) ( ( x - plsc->basecx ) * plsc->cxx + ( y - plsc->basecy ) * plsc->cxy ) ); Modified: trunk/src/plfill.c =================================================================== --- trunk/src/plfill.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plfill.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -423,7 +423,7 @@ } void -buildlist( PLINT xp1, PLINT yp1, PLINT xp2, PLINT yp2, PLINT xp3, PLINT yp3, +buildlist( PLINT xp1, PLINT yp1, PLINT xp2, PLINT yp2, PLINT UNUSED( xp3 ), PLINT yp3, PLINT dinc ) { PLINT min_y, max_y; Modified: trunk/src/plfreetype.c =================================================================== --- trunk/src/plfreetype.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plfreetype.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -136,7 +136,7 @@ // Private prototypes for use in this file only -static void FT_PlotChar( PLStream *pls, FT_Data *FT, FT_GlyphSlot slot, int x, int y, short colour ); +static void FT_PlotChar( PLStream *pls, FT_Data *FT, FT_GlyphSlot slot, int x, int y ); static void FT_SetFace( PLStream *pls, PLUNICODE fci ); static PLFLT CalculateIncrement( int bg, int fg, int levels ); @@ -384,7 +384,7 @@ FT_Load_Char( FT->face, text[i], ( FT->smooth_text == 0 ) ? FT_LOAD_MONOCHROME + FT_LOAD_RENDER : FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT ); FT_PlotChar( pls, FT, FT->face->glyph, - ROUND( x / 64.0 ), ROUND( y / 64.0 ), 2 ); // render the text + ROUND( x / 64.0 ), ROUND( y / 64.0 ) ); // render the text x += (int) FT->face->glyph->advance.x; y -= (int) FT->face->glyph->advance.y; @@ -403,7 +403,7 @@ void FT_PlotChar( PLStream *pls, FT_Data *FT, FT_GlyphSlot slot, - int x, int y, short colour ) + int x, int y ) { unsigned char bittest; short i, k, j; @@ -1272,7 +1272,7 @@ // x -= (int) ( ( FT->face->glyph->advance.x >> 6 ) / 2 ); - FT_PlotChar( pls, FT, FT->face->glyph, x, y, (short) pls->icol0 ); // render the text + FT_PlotChar( pls, FT, FT->face->glyph, x, y ); // render the text } Modified: trunk/src/plmap.c =================================================================== --- trunk/src/plmap.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plmap.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -87,7 +87,7 @@ void plmap( void ( *mapform )( PLINT, PLFLT *, PLFLT * ), const char *type, - PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat ) + PLFLT minlong, PLFLT maxlong, PLFLT UNUSED( minlat ), PLFLT UNUSED( maxlat ) ) { PLINT wrap, sign; int i, j; Modified: trunk/src/plot3d.c =================================================================== --- trunk/src/plot3d.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plot3d.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -969,7 +969,7 @@ plfplot3dcl( const PLFLT *x, const PLFLT *y, PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ) + PLINT UNUSED( ixstart ), PLINT UNUSED( ixn ), const PLINT * UNUSED( indexymin ), const PLINT * UNUSED( indexymax ) ) { PLFLT cxx, cxy, cyx, cyy, cyz; PLINT init, ix, iy, color, width; Modified: trunk/src/plshade.c =================================================================== --- trunk/src/plshade.c 2011-10-27 23:18:26 UTC (rev 12005) +++ trunk/src/plshade.c 2011-10-27 23:19:42 UTC (rev 12006) @@ -124,10 +124,6 @@ #include "plplotP.h" #include <float.h> -#define MISSING_MIN_DEF (PLFLT) 1.0 -#define MISSING_MAX_DEF (PLFLT) -1.0 - - #define NEG 1 #define POS 8 #define OK 0 @@ -183,7 +179,6 @@ PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), PLPointer c2eval_data, PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT missing_min, PLFLT missing_max, PLINT nx, PLINT ny, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT shade_min, PLFLT shade_max, @@ -336,7 +331,7 @@ plshade_int( plf2eval1, (PLPointer) a, NULL, NULL, // plc2eval, (PLPointer) &cgrid, - defined, MISSING_MIN_DEF, MISSING_MAX_DEF, nx, ny, xmin, + defined, nx, ny, xmin, xmax, ymin, ymax, shade_min, shade_max, sh_cmap, sh_color, sh_width, min_color, min_width, max_color, max_width, @@ -370,7 +365,7 @@ plshade_int( plf2eval, ( PLPointer ) & grid, NULL, NULL, // plc2eval, (PLPointer) &cgrid, - defined, MISSING_MIN_DEF, MISSING_MAX_DEF, nx, ny, xmin, + defined, nx, ny, xmin, xmax, ymin, ymax, shade_min, shade_max, sh_cmap, sh_color, sh_width, min_color, min_width, max_color, max_width, @@ -400,7 +395,7 @@ PLPointer pltr_data ) { plshade_int( f2eval, f2eval_data, c2eval, c2eval_data, - NULL, MISSING_MIN_DEF, MISSING_MAX_DEF, + NULL, nx, ny, xmin, xmax, ymin, ymax, shade_min, shade_max, sh_cmap, sh_color, sh_width, min_color, min_width, max_color, max_width, @@ -433,7 +428,7 @@ plshade_int( zops->f2eval, zp, NULL, NULL, // plc2eval, (PLPointer) &cgrid, - defined, MISSING_MIN_DEF, MISSING_MAX_DEF, nx, ny, xmin, + defined, nx, ny, xmin, xmax, ymin, ymax, shade_min, shade_max, sh_cmap, sh_color, sh_width, min_color, min_width, max_color, max_width, @@ -451,19 +446,10 @@ // // 4/95 // -// new: missing_min, missing_max -// -// if data <= missing_max and data >= missing_min -// then the data will beconsidered to be missing -// this allows 2nd way to set undefined points (good for ftn) -// if missing feature is not used, set missing_max < missing_min -// // parameters: // // f2eval, f2eval_data: data to plot -// c2eval, c2eval_data: defined mask (not implimented) // defined: defined mask (old API - implimented) -// missing_min, missing_max: yet another way to set data to undefined // nx, ny: array dimensions // xmin, xmax, ymin, ymax: grid coordinates // shade_min, shade_max: shade region with values between ... @@ -482,10 +468,9 @@ static void plshade_int( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), PLPointer f2eval_data, - PLFLT ( *c2eval )( PLINT, PLINT, PLPointer ), - PLPointer c2eval_data, + PLFLT ( * c2eval )( PLINT, PLINT, PLPointer ), // unused, but macro doesn't work + PLPointer UNUSED( c2eval_data ), PLINT ( *defined )( PLFLT, PLFLT ), - PLFLT missing_min, PLFLT missing_max, PLINT nx, PLINT ny, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT shade_min, PLFLT shade_max, @@ -502,6 +487,8 @@ PLFLT x[8], y[8], xp[2], tx, ty; int *c, *c0, *c1; + (void) c2eval; // Cast to void to silence compiler warning about unused parameter + if ( plsc->level < 3 ) { plabort( "plfshade: window must be set up first" ); @@ -1251,7 +1238,7 @@ #define RATIO_SQ 6.0 static PLINT -plctest( PLFLT *x, PLFLT level ) +plctest( PLFLT *x, PLFLT UNUSED( level ) ) { int i, j; double t[4], sorted[4], temp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2011-10-28 19:07:48
|
Revision: 12015 http://plplot.svn.sourceforge.net/plplot/?rev=12015&view=rev Author: hbabcock Date: 2011-10-28 19:07:41 +0000 (Fri, 28 Oct 2011) Log Message: ----------- Doxygen documentation for ltdl_win32.c, mt19937ar.c and pdfutils.c Modified Paths: -------------- trunk/src/ltdl_win32.c trunk/src/mt19937ar.c trunk/src/pdfutils.c Modified: trunk/src/ltdl_win32.c =================================================================== --- trunk/src/ltdl_win32.c 2011-10-28 19:02:53 UTC (rev 12014) +++ trunk/src/ltdl_win32.c 2011-10-28 19:07:41 UTC (rev 12015) @@ -22,6 +22,11 @@ // // +//! @file +//! +//! Routines that map unix libtool commands to their window equivalent. +//! + #include <windows.h> #include <stdlib.h> #include "ltdl_win32.h" @@ -34,14 +39,16 @@ char errortext[512]; -// initialise variables +//! initialise variables +//! void lt_dlinit( void ) { lastHandle = NULL; } -// on exit free library handles and release allocate memory +//! on exit free library handles and release allocate memory +//! void lt_dlexit( void ) { lt_dlhandle prev; @@ -57,9 +64,14 @@ } -// try to open shared library with given dllname. If there is -// no extension given LoadLibrary() assumes .dll. The library -// must be somewhere in the path or in the current directory. +//! Try to open shared library with given dllname. If there is +//! no extension given LoadLibrary() assumes .dll. The library +//! must be somewhere in the path or in the current directory. +//! +//! @param dllname The name of shared library. +//! +//! @returns A handle to the shared library (if found). +//! lt_dlhandle lt_dlopenext( char* dllname ) { lt_dlhandle dlhandle = malloc( sizeof ( struct __dlhandle ) ); @@ -79,7 +91,10 @@ } -// return last error occured. Needs some work :). +//! return last error occured. Needs some work :). +//! +//! @returns Not much.. A string containing "No error information." +//! const char* lt_dlerror() { strncpy( errortext, "No error information", 512 ); @@ -88,7 +103,13 @@ } -// load symbol from library +//! load symbol from library +//! +//! @param dlhandle Library handle as returned by ltdlopenext(). +//! @param symbol The name of symbol to load. +//! +//! @returns A pointer to the symbol requested. +//! void* lt_dlsym( lt_dlhandle dlhandle, const char* symbol ) { if ( dlhandle->hinstLib ) @@ -112,7 +133,12 @@ return NULL; } -// Placeholder that does nothing for now. +//! Placeholder that does nothing for now. +//! +//! @param handle Library handle. +//! +//! @returns 0 +//! int lt_dlmakeresident( lt_dlhandle handle ) { return 0; Modified: trunk/src/mt19937ar.c =================================================================== --- trunk/src/mt19937ar.c 2011-10-28 19:02:53 UTC (rev 12014) +++ trunk/src/mt19937ar.c 2011-10-28 19:07:41 UTC (rev 12015) @@ -43,6 +43,11 @@ // email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space) // +//! @file +//! +//! Mersenne twister random number generator. +//! + #include <stdio.h> #include "mt19937ar.h" @@ -56,7 +61,10 @@ static unsigned long mt[N]; // the array for the state vector static int mti = N + 1; // mti==N+1 means mt[N] is not initialized -// initializes mt[N] with a seed +//! Initializes mt[N] with a seed +//! +//! @param s Seed value for the random number generator. +//! void init_genrand( unsigned long s ) { mt[0] = s & 0xffffffffUL; @@ -73,10 +81,12 @@ } } -// initialize by an array with array-length -// init_key is the array for initializing keys -// key_length is its length -// slight change for C++, 2004/2/26 +//! Initialize by an array with array-length +//! Slight change for C++, 2004/2/26 +//! +//! @param init_key The array for initializing keys +//! @param key_length Length of the array +//! void init_by_array( unsigned long init_key[], int key_length ) { int i, j, k; @@ -111,7 +121,10 @@ mt[0] = 0x80000000UL; // MSB is 1; assuring non-zero initial array } -// generates a random number on [0,0xffffffff]-interval +//! generates a random number on [0,0xffffffff]-interval +//! +//! @returns A random integer with 32-bit resolution. +//! unsigned long genrand_int32( void ) { unsigned long y; @@ -152,34 +165,49 @@ return y; } -// generates a random number on [0,0x7fffffff]-interval +//! generates a random number on [0,0x7fffffff]-interval +//! +//! @returns A random integer with 31-bit resolution. +//! long genrand_int31( void ) { return (long) ( genrand_int32() >> 1 ); } -// generates a random number on [0,1]-real-interval +//! generates a random number on [0,1]-real-interval +//! +//! @returns A random number [0,1]. +//! double genrand_real1( void ) { return (double) genrand_int32() * ( 1.0 / 4294967295.0 ); // divided by 2^32-1 } -// generates a random number on [0,1)-real-interval +//! generates a random number on [0,1)-real-interval +//! +//! @returns A random number [0,1). +//! double genrand_real2( void ) { return (double) genrand_int32() * ( 1.0 / 4294967296.0 ); // divided by 2^32 } -// generates a random number on (0,1)-real-interval +//! generates a random number on (0,1)-real-interval +//! +//! @returns A random number (0,1). +//! double genrand_real3( void ) { return ( ( (double) genrand_int32() ) + 0.5 ) * ( 1.0 / 4294967296.0 ); // divided by 2^32 } -// generates a random number on [0,1) with 53-bit resolution +//! generates a random number on [0,1) with 53-bit resolution +//! +//! @returns A random numer [0,1) with 53-bit resolution. +//! double genrand_res53( void ) { unsigned long a = genrand_int32() >> 5, b = genrand_int32() >> 6; Modified: trunk/src/pdfutils.c =================================================================== --- trunk/src/pdfutils.c 2011-10-28 19:02:53 UTC (rev 12014) +++ trunk/src/pdfutils.c 2011-10-28 19:07:41 UTC (rev 12015) @@ -28,10 +28,12 @@ // //-------------------------------------------------------------------------- // -// These functions do the low-level reading/writing of portable data files. -// Data can be written to/read from either a file handle or memory buffer. -// +//! @file +//! These functions do the low-level reading/writing of portable data files. +//! Data can be written to/read from either a file handle or memory buffer. +//! + #define NEED_PLDEBUG #include "plplotP.h" @@ -43,7 +45,11 @@ //-------------------------------------------------------------------------- // void pdf_set (string, value) // -// Set an option. Pretty sparse right now but you never know. +//! Set an option. Pretty sparse right now but you never know. +//! +//! @param option The option string. +//! @param value The value to set it to. +//! //-------------------------------------------------------------------------- void @@ -56,8 +62,12 @@ //-------------------------------------------------------------------------- // pdf_fopen() // -// Initializes a PDFstrm for a file oriented device. -// Used exactly like fopen(). +//! Initializes a PDFstrm for a file oriented device. +//! Used exactly like fopen(). +//! +//! @param filename The filename of the file to open. +//! @param mode File access mode, as would be used by fopen. +//! //-------------------------------------------------------------------------- PDFstrm * @@ -128,8 +138,14 @@ //-------------------------------------------------------------------------- // pdf_bopen() // -// Initializes a PDFstrm for reading/writing to a memory buffer. -// If buffer is NULL, a standard buffer is allocated. +//! Initializes a PDFstrm for reading/writing to a memory buffer. +//! If buffer is NULL, a standard buffer is allocated. +//! +//! @param buffer User allocated memory, can be NULL. +//! @param bufmax Size of buffer, or the desired buffer. +//! +//! @returns A PDFstrm structure. +//! //-------------------------------------------------------------------------- PDFstrm * @@ -176,8 +192,12 @@ //-------------------------------------------------------------------------- // pdf_finit() // -// Initializes a PDFstrm for a file oriented device. -// Like pdf_fopen() but an existing file handle is specified. +//! Initializes a PDFstrm for a file oriented device. +//! Like pdf_fopen() but an existing file handle is specified. +//! +//! @param file A open file handle. +//! +//! @returns A PDFstrm structure. //-------------------------------------------------------------------------- PDFstrm * @@ -205,8 +225,13 @@ //-------------------------------------------------------------------------- // pdf_close() // -// Closes a PDFstrm. -// Used exactly like fclose(). +//! Closes a PDFstrm. +//! Used exactly like fclose(). +//! +//! @param pdfs The file stream to close. +//! +//! @returns 0 +//! //-------------------------------------------------------------------------- int @@ -238,7 +263,13 @@ //-------------------------------------------------------------------------- // int pdf_putc() // -// Writes a single character. +//! Writes a single character. +//! +//! @param c The character to write. +//! @param pdfs The stream to write it to. +//! +//! @returns The character written or EOF. +//! //-------------------------------------------------------------------------- int @@ -282,7 +313,12 @@ //-------------------------------------------------------------------------- // int pdf_getc() // -// Reads a single character. +//! Reads a single character. +//! +//! @param pdfs The stream to read the character from. +//! +//! @return The character read or EOF. +//! //-------------------------------------------------------------------------- int @@ -316,7 +352,13 @@ //-------------------------------------------------------------------------- // int pdf_ungetc() // -// Push back the last command read. +//! Push back the last command read. +//! +//! @param c The character to pushback. +//! @param pdfs The stream to push it back into. +//! +//! @returns The character pushed back, or EOF. +//! //-------------------------------------------------------------------------- int @@ -355,7 +397,14 @@ //-------------------------------------------------------------------------- // int pdf_wrx() // -// Writes a record. +//! Writes a record. +//! +//! @param x The data to write. +//! @param nitems The length of x. +//! @param pdfs The stream to write it to. +//! +//! @returns The number of bytes actually written. +//! //-------------------------------------------------------------------------- static int @@ -401,7 +450,14 @@ //-------------------------------------------------------------------------- // int pdf_rdx() // -// Reads a record. +//! Reads a record. +//! +//! @param x Storage for the data to read. +//! @param nitems The length of the x. +//! @param pdfs The stream to read it from. +//! +//! @returns The number of bytes read. +//! //-------------------------------------------------------------------------- int @@ -438,9 +494,15 @@ //-------------------------------------------------------------------------- // pdf_wr_header() // -// Writes a header string. Input string must be NULL-terminated. The -// written string is terminated by a new-line, not a NULL. This is done -// so you can type e.g. "% strings <file> | head" and get sensible output. +//! Writes a header string. Input string must be NULL-terminated. The +//! written string is terminated by a new-line, not a NULL. This is done +//! so you can type e.g. "% strings <file> | head" and get sensible output. +//! +//! @param pdfs The stream to which to write the header. +//! @param header The header. +//! +//! @returns 0 if there was no error. +//! //-------------------------------------------------------------------------- int @@ -466,8 +528,14 @@ //-------------------------------------------------------------------------- // int pdf_rd_header // -// Reads a newline-terminated header string from PDFstrm *pdfs, and -// converts to a usual NULL-terminated string. 80 chars maximum assumed. +//! Reads a newline-terminated header string from PDFstrm *pdfs, and +//! converts to a usual NULL-terminated string. 80 chars maximum assumed. +//! +//! @param pdfs The stream to read the header from. +//! @param header Pre-allocated storage for the header. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -493,7 +561,13 @@ //-------------------------------------------------------------------------- // pdf_wr_string() // -// Writes a null-terminated string. +//! Writes a null-terminated string. +//! +//! @param pdfs The stream to write the string to. +//! @param string The string to write. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -515,8 +589,15 @@ //-------------------------------------------------------------------------- // int pdf_rd_string // -// Reads a null-terminated string from PDFstrm *pdfs. -// A max of nmax chars are read. +//! Reads a null-terminated string from PDFstrm *pdfs. +//! A max of nmax chars are read. +//! +//! @param pdfs The stream to read the string from. +//! @param string Pre-allocated storage for the string. +//! @param nmax The size of string. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -542,7 +623,13 @@ //-------------------------------------------------------------------------- // int pdf_wr_1byte() // -// Writes a U_CHAR as a single byte. +//! Writes a U_CHAR as a single byte. +//! +//! @param pdfs The stream to write the byte too. +//! @param s The byte to write. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -560,7 +647,13 @@ //-------------------------------------------------------------------------- // int pdf_rd_1byte() // -// Reads a single byte, storing into a U_CHAR. +//! Reads a single byte, storing into a U_CHAR. +//! +//! @param pdfs The stream to read the byte from. +//! @param ps Storage for the byte. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -578,7 +671,13 @@ //-------------------------------------------------------------------------- // pdf_wr_2bytes() // -// Writes a U_SHORT as two single bytes, low end first. +//! Writes a U_SHORT as two single bytes, low end first. +//! +//! @param pdfs The stream to write the two bytes to. +//! @param s The two bytes to write. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -598,7 +697,13 @@ //-------------------------------------------------------------------------- // pdf_rd_2bytes() // -// Reads a U_SHORT from two single bytes, low end first. +//! Reads a U_SHORT from two single bytes, low end first. +//! +//! @param pdfs The stream to read the two bytes from. +//! @param ps Pre-allocated storage for the two bytes. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -622,7 +727,14 @@ //-------------------------------------------------------------------------- // pdf_wr_2nbytes() // -// Writes n U_SHORT's as 2n single bytes, low end first. +//! Writes n U_SHORT's as 2n single bytes, low end first. +//! +//! @param pdfs The stream to write the shorts to. +//! @param s An array of shorts. +//! @param n Size of s. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -645,7 +757,14 @@ //-------------------------------------------------------------------------- // pdf_rd_2nbytes() // -// Reads n U_SHORT's from 2n single bytes, low end first. +//! Reads n U_SHORT's from 2n single bytes, low end first. +//! +//! @param pdfs The stream to read the shorts from. +//! @param s Pre-allocated storage for the shorts. +//! @param n Size of s. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -672,7 +791,13 @@ //-------------------------------------------------------------------------- // pdf_wr_4bytes() // -// Writes an unsigned long as four single bytes, low end first. +//! Writes an unsigned long as four single bytes, low end first. +//! +//! @param pdfs The stream to write the unsigned long to. +//! @param s The unsigned long to write. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -694,7 +819,13 @@ //-------------------------------------------------------------------------- // pdf_rd_4bytes() // -// Reads an unsigned long from 4 single bytes, low end first. +//! Reads an unsigned long from 4 single bytes, low end first. +//! +//! @param pdfs The stream to read the unsigned long from. +//! @param ps Pre-allocated storage for the unsigned long. +//! +//! @returns 0 is successful. +//! //-------------------------------------------------------------------------- int @@ -772,7 +903,13 @@ //-------------------------------------------------------------------------- // int pdf_wr_ieeef() // -// Writes a float in IEEE single precision (32 bit) format. +//! Writes a float in IEEE single precision (32 bit) format. +//! +//! @param pdfs The stream to write the float to. +//! @param f The float. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -842,7 +979,13 @@ //-------------------------------------------------------------------------- // int pdf_rd_ieeef() // -// Reads a float from a IEEE single precision (32 bit) format. +//! Reads a float from a IEEE single precision (32 bit) format. +//! +//! @param pdfs The stream to read the float from. +//! @param pf Pre-allocated storage for the float. +//! +//! @returns 0 if successful. +//! //-------------------------------------------------------------------------- int @@ -891,10 +1034,14 @@ //-------------------------------------------------------------------------- // print_ieeef() // -// Prints binary representation for numbers pointed to by arguments. -// The first argument is the original float, the second is the -// IEEE representation. They should be the same on any machine that -// uses IEEE floats. +//! Prints binary representation for numbers pointed to by arguments. +//! The first argument is the original float, the second is the +//! IEEE representation. They should be the same on any machine that +//! uses IEEE floats. +//! +//! @param vx The original float? +//! @param vy The IEEE representation? +//! //-------------------------------------------------------------------------- static void @@ -936,16 +1083,21 @@ //-------------------------------------------------------------------------- // plAlloc2dGrid() // -// Allocates a block of memory for use as a 2-d grid of PLFLT's. -// Resulting array can be indexed as f[i][j] anywhere. This is to be used -// instead of PLFLT f[nx][ny], which is less useful. Note that this type -// of allocation is required by the PLplot functions which take a 2-d -// grids of PLFLT's as an argument, such as plcont() and plot3d(). -// Example usage: -// -// PLFLT **z; -// -// Alloc2dGrid(&z, XPTS, YPTS); +//! Allocates a block of memory for use as a 2-d grid of PLFLT's. +//! Resulting array can be indexed as f[i][j] anywhere. This is to be used +//! instead of PLFLT f[nx][ny], which is less useful. Note that this type +//! of allocation is required by the PLplot functions which take a 2-d +//! grids of PLFLT's as an argument, such as plcont() and plot3d(). +//! Example usage: +//! +//! PLFLT **z; +//! +//! Alloc2dGrid(&z, XPTS, YPTS); +//! +//! @param f Location of the storage (address of a **). +//! @param nx Size of the grid in x. +//! @param ny Size of the grid in y. +//! //-------------------------------------------------------------------------- void @@ -966,7 +1118,12 @@ //-------------------------------------------------------------------------- // Free2dGrid() // -// Frees a block of memory allocated with Alloc2dGrid(). +//! Frees a block of memory allocated with Alloc2dGrid(). +//! +//! @param f The [][] to the storage. +//! @param nx Size of the grid in x. +//! @param ny Size of the grid in y (not used). +//! //-------------------------------------------------------------------------- void @@ -983,8 +1140,15 @@ //-------------------------------------------------------------------------- // MinMax2dGrid() // -// Finds the maximum and minimum of a 2d matrix allocated with plAllc2dGrid(). -// NaN and +/- infinity values are ignored. +//! Finds the maximum and minimum of a 2d matrix allocated with plAllc2dGrid(). +//! NaN and +/- infinity values are ignored. +//! +//! param f 2d matrix pointer. +//! param nx Size of the grid in x. +//! param ny Size of the grid in y. +//! param fnmax Maximum value in the matrix. +//! param fnmin Minimum value in the matrix. +//! //-------------------------------------------------------------------------- void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2011-11-03 20:10:27
|
Revision: 12024 http://plplot.svn.sourceforge.net/plplot/?rev=12024&view=rev Author: hbabcock Date: 2011-11-03 20:10:21 +0000 (Thu, 03 Nov 2011) Log Message: ----------- Add doxygen documentation. Modified Paths: -------------- trunk/src/plaffine.c trunk/src/plarc.c Modified: trunk/src/plaffine.c =================================================================== --- trunk/src/plaffine.c 2011-11-02 07:45:58 UTC (rev 12023) +++ trunk/src/plaffine.c 2011-11-03 20:10:21 UTC (rev 12024) @@ -24,31 +24,36 @@ #include "plplotP.h" -// For background on these affine functions see SVG specification, e.g., -// http://www.w3.org/TR/SVGTiny12/coords.html#EstablishingANewUserSpace. -// Affine 3x3 matrices with elements A_i,j always have a last row of -// 0, 0, 1 so the elements are conveniently stored in a vector in the order -// A_1_1, A_2_1, A_1_2, A_2_2, A_1_3, A_2_3, with the last row implied. +//! @file +//! These function perform variuos affine transformations. +//! +//! For background on these affine functions see SVG specification, e.g., +//! http://www.w3.org/TR/SVGTiny12/coords.html#EstablishingANewUserSpace. +//! Affine 3x3 matrices with elements A_i,j always have a last row of +//! 0, 0, 1 so the elements are conveniently stored in a vector in the order +//! A_1_1, A_2_1, A_1_2, A_2_2, A_1_3, A_2_3, with the last row implied. +//! +//! N.B. The PLplot affine interpretation of translate, scale, etc., is +//! as actions on coordinate systems, rather than actions on objects. This +//! is identical to the SVG specficiation interpretation. However, the +//! SVG specification interprets the affine matrix as follows: +//! old_coord_vector = affine_matrix * new_coordinate vector. In PLplot +//! we use the alternative interpretation +//! new_coord_vector = affine_matrix * old_coordinate vector. +//! The result is all affine matrices below are the inverses of the SVG +//! equivalents. +//! +//! N.B. All PLplot affine functions below return the affine matrix result (in +//! vector form) as the first argument). It is the calling routine's +//! responsibility to provide the space for all affine matrix arguments, +//! i.e., a PLFLT array with a dimension of 6. +//! // -// N.B. The PLplot affine interpretation of translate, scale, etc., is -// as actions on coordinate systems, rather than actions on objects. This -// is identical to the SVG specficiation interpretation. However, the -// SVG specification interprets the affine matrix as follows: -// old_coord_vector = affine_matrix * new_coordinate vector. In PLplot -// we use the alternative interpretation -// new_coord_vector = affine_matrix * old_coordinate vector. -// The result is all affine matrices below are the inverses of the SVG -// equivalents. -// -// N.B. All PLplot affine functions below return the affine matrix result (in -// vector form) as the first argument). It is the calling routine's -// responsibility to provide the space for all affine matrix arguments, -// i.e., a PLFLT array with a dimension of 6. -// -// -// Returns affine identity matrix - +//! Returns affine identity matrix +//! +//! @param affine_vector Initialize a (pre-allocated) transform matrix. +//! void plP_affine_identity( PLFLT *affine_vector ) { @@ -60,8 +65,12 @@ affine_vector[5] = 0.; } -// Translate new coordinate system axes relative to the old. - +//! Translate new coordinate system axes relative to the old. +//! +//! @param affine_vector Pre-allocated storage for a translation matrix. +//! @param xtranslate Amount to translate in x. +//! @param ytranslate Amount to translate in y. +//! void plP_affine_translate( PLFLT *affine_vector, PLFLT xtranslate, PLFLT ytranslate ) { @@ -76,8 +85,12 @@ affine_vector[5] = -ytranslate; } -// Scale new coordinate system axes relative to the old. - +//! Scale new coordinate system axes relative to the old. +//! +//! @param affine_vector Pre-allocate storage for a scale matrix. +//! @param xscale Amount to scale in x. +//! @param yscale Amount to scale in y. +//! void plP_affine_scale( PLFLT *affine_vector, PLFLT xscale, PLFLT yscale ) { @@ -102,9 +115,12 @@ affine_vector[5] = 0.; } -// Rotate new coordinate system axes relative to the old. -// angle is in degrees. - +//! Rotate new coordinate system axes relative to the old. +//! angle is in degrees. +//! +//! @param affine_vector Pre-allocated storage for a rotation matrix. +//! @param angle Amount to rotate in degrees. +//! void plP_affine_rotate( PLFLT *affine_vector, PLFLT angle ) { @@ -118,8 +134,12 @@ affine_vector[5] = 0.; } -// Skew new X coordinate axis relative to the old. -// angle is in degrees. +//! Skew new X coordinate axis relative to the old. +//! angle is in degrees. +//! +//! @param affine_vector Pre-allocated storage for a skew (in x) matrix. +//! @param angle Amount to skew in degrees. +//! void plP_affine_xskew( PLFLT *affine_vector, PLFLT angle ) @@ -133,8 +153,12 @@ affine_vector[5] = 0.; } -// Skew new Y coordinate axis relative to the old. -// angle is in degrees. +//! Skew new Y coordinate axis relative to the old. +//! angle is in degrees. +//! +//! @param affine_vector Pre-allocated storage for a skew (in y) matrix. +//! @param angle Amount to skew in degrees. +//! void plP_affine_yskew( PLFLT *affine_vector, PLFLT angle ) @@ -148,11 +172,15 @@ affine_vector[5] = 0.; } -// Multiply two affine transformation matrices to form a third. -// -// A = B * C -// -// +//! Multiply two affine transformation matrices to form a third. +//! +//! A = B * C +//! +//! @param affine_vectorA Pre-allocated storage for the result of +//! multiplying matrix affine_vectorB by matrix affine_vectorC. +//! @param affine_vectorB First matrix to multiply. +//! @param affine_vectorC Second matrix to multiply. +//! void plP_affine_multiply( Modified: trunk/src/plarc.c =================================================================== --- trunk/src/plarc.c 2011-11-02 07:45:58 UTC (rev 12023) +++ trunk/src/plarc.c 2011-11-03 20:10:21 UTC (rev 12024) @@ -19,6 +19,10 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // +//! @file +//! Functions for drawing an arc. +//! + #include "plplotP.h" #define CIRCLE_SEGMENTS ( PL_MAXPOLY - 1 ) @@ -29,8 +33,19 @@ //-------------------------------------------------------------------------- // plarc_approx : Plot an approximated arc with a series of lines // -// Takes the same arguments, with the same units, as c_plarc below. -// +//! Takes the same arguments, with the same units, as c_plarc below. +//! This is the fallback function in the event that the output +//! device does not have native support for drawing arcs. +//! +//! @param x Center coordinate of the arc in x. +//! @param y Center coordinate of the arc in y. +//! @param a Radius of the arcs major axis. +//! @param b Radius of the arcs minor axis. +//! @param angle1 Start angle in degrees. +//! @param angle2 End angle in degrees. +//! @param rotate How much to rotate the arc? +//! @param fill Fill the arc. +//! //-------------------------------------------------------------------------- void plarc_approx( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, PLFLT rotate, PLBOOL fill ) @@ -93,23 +108,34 @@ //-------------------------------------------------------------------------- // plarc : Plot an arc // -// Takes the following arguments: +//! Plot an Arc. +//! Takes the following arguments: +//! +//! x, y: +//! x and y coordinates for the center of the arc +//! +//! a, b: +//! Radius of the arc's major and minor axes +//! +//! angle1: +//! Start angle (degrees) +//! +//! angle2: +//! End angle (degrees) +//! +//! fill: +//! Should the arc be filled +//! +//! @param x Center coordinate of the arc in x. +//! @param y Center coordinate of the arc in y. +//! @param a Radius of the arcs major axis. +//! @param b Radius of the arcs minor axis. +//! @param angle1 Start angle in degrees. +//! @param angle2 End angle in degrees. +//! @param rotate How much to rotate the arc? +//! @param fill Fill the arc. +//! // -// x, y: -// x and y coordinates for the center of the arc -// -// a, b: -// Radius of the arc's major and minor axes -// -// angle1: -// Start angle (degrees) -// -// angle2: -// End angle (degrees) -// -// fill: -// Should the arc be filled? -// //-------------------------------------------------------------------------- void c_plarc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, PLFLT rotate, PLBOOL fill ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-12-02 13:14:12
|
Revision: 12089 http://plplot.svn.sourceforge.net/plplot/?rev=12089&view=rev Author: andrewross Date: 2011-12-02 13:14:05 +0000 (Fri, 02 Dec 2011) Log Message: ----------- Fix up a number of unused variables picked up by compiler warnings. In one case this fixed a bug (# at beginning of rgb value passed as argument to the -bg option was not properly ignored. Modified Paths: -------------- trunk/src/plargs.c trunk/src/plcore.c trunk/src/plgradient.c trunk/src/plstdio.c Modified: trunk/src/plargs.c =================================================================== --- trunk/src/plargs.c 2011-12-02 10:31:07 UTC (rev 12088) +++ trunk/src/plargs.c 2011-12-02 13:14:05 UTC (rev 12089) @@ -1,4 +1,4 @@ -// $Id$ +g/ $Id$ // // Copyright 1993, 1994, 1995 // Maurice LeBrun mj...@di... @@ -1917,7 +1917,7 @@ else rgb = opt_arg; - strncpy( opttmp, opt_arg, OPTMAX - 1 ); + strncpy( opttmp, rgb, OPTMAX - 1 ); opttmp[OPTMAX - 1] = '\0'; if ( strchr( opttmp, '_' ) ) Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2011-12-02 10:31:07 UTC (rev 12088) +++ trunk/src/plcore.c 2011-12-02 13:14:05 UTC (rev 12089) @@ -1925,7 +1925,7 @@ static void calc_diori( void ) { - PLFLT r11, r21, r12, r22, cost, sint; + PLFLT cost, sint; PLFLT x0, y0, lx, ly, aspect; PLFLT affine_result[NAFFINE], affine_left[NAFFINE]; @@ -1948,16 +1948,11 @@ x0 = ( plsc->phyxma + plsc->phyxmi ) / 2.; y0 = ( plsc->phyyma + plsc->phyymi ) / 2.; -// Rotation matrix +// Rotation - r11 = cos( plsc->diorot * PI / 2. ); - r21 = sin( plsc->diorot * PI / 2. ); - r12 = -r21; - r22 = r11; + cost = ABS( cos( plsc->diorot * PI / 2. ) ); + sint = ABS( sin( plsc->diorot * PI / 2. ) ); - cost = ABS( r11 ); - sint = ABS( r21 ); - // Flip aspect ratio as necessary. Grungy but I don't see a better way aspect = plsc->aspect; Modified: trunk/src/plgradient.c =================================================================== --- trunk/src/plgradient.c 2011-12-02 10:31:07 UTC (rev 12088) +++ trunk/src/plgradient.c 2011-12-02 13:14:05 UTC (rev 12089) @@ -77,7 +77,7 @@ else { #define NGRAD 2 - int i, irot_min, irot_max; + int i, irot_min; PLINT _xpoly[PL_MAXPOLY], _ypoly[PL_MAXPOLY]; PLINT *xpoly, *ypoly; PLINT xgrad[NGRAD], ygrad[NGRAD], clpxmi, clpxma, clpymi, clpyma; @@ -92,7 +92,6 @@ xrot_min = xrot; xrot_max = xrot; irot_min = 0; - irot_max = 0; for ( i = 1; i < n; i++ ) { xrot = x[i] * cosangle + y[i] * sinangle; @@ -104,7 +103,6 @@ else if ( xrot > xrot_max ) { xrot_max = xrot; - irot_max = i; } } // xrot_min and xrot_max are the minimum and maximum rotated x Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2011-12-02 10:31:07 UTC (rev 12088) +++ trunk/src/plstdio.c 2011-12-02 13:14:05 UTC (rev 12089) @@ -176,7 +176,9 @@ const char *tmpdir; char *template; const char *tmpname = "plplot_XXXXXX"; +#if !defined PL_HAVE_MKSTEMP int flags; +#endif #if defined ( MSDOS ) || defined ( WIN32 ) tmpdir = getenv( "TEMP" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-09-18 18:51:06
|
Revision: 12508 http://sourceforge.net/p/plplot/code/12508 Author: airwin Date: 2013-09-18 18:51:03 +0000 (Wed, 18 Sep 2013) Log Message: ----------- Update doxygen documentation of PL_UNUSED function parameters to eliminate doxygen warning messages concerning such parameters and to produce reasonable looking doxygen results for those parameters. Modified Paths: -------------- trunk/src/pdfutils.c trunk/src/plargs.c trunk/src/plot3d.c Modified: trunk/src/pdfutils.c =================================================================== --- trunk/src/pdfutils.c 2013-09-18 07:26:10 UTC (rev 12507) +++ trunk/src/pdfutils.c 2013-09-18 18:51:03 UTC (rev 12508) @@ -1122,8 +1122,7 @@ //! //! @param f The [][] to the storage. //! @param nx Size of the grid in x. -//! @param ny Size of the grid in y (not used). -//! +//! @param PL_UNUSED( ny) Not used. //-------------------------------------------------------------------------- void Modified: trunk/src/plargs.c =================================================================== --- trunk/src/plargs.c 2013-09-18 07:26:10 UTC (rev 12507) +++ trunk/src/plargs.c 2013-09-18 18:51:03 UTC (rev 12508) @@ -1543,9 +1543,9 @@ //! Performs appropriate action for option "h": //! Issues help message //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 2. //! @@ -1566,9 +1566,9 @@ //! Performs appropriate action for option "v": //! Issues version message //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 2. //! @@ -1589,9 +1589,9 @@ //! Performs appropriate action for option "verbose": //! Turn on verbosity flag //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1610,9 +1610,9 @@ //! Performs appropriate action for option "debug": //! Turn on debugging flag //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1632,9 +1632,9 @@ //! Performs appropriate action for option "hack": //! Enables driver-specific hack(s) //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1653,9 +1653,9 @@ //! Performs appropriate action for option "dev": //! Sets output device keyword //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg The name of the output device. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1674,9 +1674,9 @@ //! Performs appropriate action for option "o": //! Sets output file name //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg The file family name. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1695,9 +1695,9 @@ //! Performs appropriate action for option "mar": //! Sets relative margin width //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot margin width. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1716,9 +1716,9 @@ //! Performs appropriate action for option "a": //! Sets plot aspect ratio on page //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot aspect ratio. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1737,9 +1737,9 @@ //! Performs appropriate action for option "jx": //! Sets relative justification in x //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot relative justification in x(?) -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1758,9 +1758,9 @@ //! Performs appropriate action for option "jy": //! Sets relative justification in y //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot relative justification in y(?) -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1779,9 +1779,9 @@ //! Performs appropriate action for option "ori": //! Sets orientation //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot orientation. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1800,9 +1800,9 @@ //! Performs appropriate action for option "freeaspect": //! Allow aspect ratio to adjust to orientation swaps. //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1835,9 +1835,9 @@ //! bit of code from ps.c that has to do with pls->portrait to the //! appropriate driver file. //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1856,9 +1856,9 @@ //! Performs appropriate action for option "width": //! Sets pen width //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot pen width. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1893,9 +1893,9 @@ //! -bg ff0000 (set background to red with an alpha value of 1.0) //! -bg ff0000_0.1 (set background to red with an alpha value of 0.1 //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Background RGB color in hex. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1976,9 +1976,9 @@ //! Performs appropriate action for option "ncol0": //! Sets number of colors to allocate in cmap 0 (upper bound). //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Number of color map 0 colors. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -1997,9 +1997,9 @@ //! Performs appropriate action for option "ncol1": //! Sets number of colors to allocate in cmap 1 (upper bound). //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Number of color map 1 colors. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2018,9 +2018,9 @@ //! Performs appropriate action for option "wplt": //! Sets (zoom) window into plot (e.g. "0,0,0.5,0.5") //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Zoom setting. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2065,9 +2065,9 @@ //! Get driver specific options in the form <option[=value]>[,option[=value]]* //! If "value" is not specified, it defaults to "1". //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg The driver specific option. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2155,9 +2155,9 @@ //! Performs appropriate action for option "fam": //! Enables family output files //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2185,9 +2185,9 @@ //! Note case of the trailing suffix doesn't matter. //! If no suffix, defaults to MB. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Family size setting. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2243,9 +2243,9 @@ //! Performs appropriate action for option "fbeg": //! Starts with the specified family member number. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Number of the first plot. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2265,9 +2265,9 @@ //! Performs appropriate action for option "finc": //! Specify increment between family members. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Amount to increment the plot number between plots. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2287,9 +2287,9 @@ //! Performs appropriate action for option "fflen": //! Specify minimum field length for family member number. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Size of the family number field (e.g. "1", "01", "001" ?) -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2309,9 +2309,9 @@ //! Performs appropriate action for option "np": //! Disables pause between pages //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2330,9 +2330,9 @@ //! Performs appropriate action for option "nopixmap": //! Disables use of pixmaps in X drivers //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2351,9 +2351,9 @@ //! Performs appropriate action for option "db": //! Double buffer X output (update only done on eop or Expose) //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2372,9 +2372,9 @@ //! Performs appropriate action for option "bufmax": //! Sets size of data buffer for tk driver //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Size of the data buffer for the tk driver. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2393,9 +2393,9 @@ //! Performs appropriate action for option "server_name": //! Sets main window name of server (Tcl/TK driver only) //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg The name of the main window. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2414,9 +2414,9 @@ //! Performs appropriate action for option "plserver": //! Sets name to use when invoking server (Tcl/TK driver only) //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Name of Tcl/TK server (?). -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2435,9 +2435,9 @@ //! Performs appropriate action for option "plwindow": //! Sets PLplot window name //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Name of the window. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2460,9 +2460,9 @@ //! Performs appropriate action for option "auto_path": //! Sets additional directories to autoload //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Additional directories to add the the load path (?). -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2481,9 +2481,9 @@ //! Performs appropriate action for option "px": //! Set packing in x //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg X packing (?). -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2502,9 +2502,9 @@ //! Performs appropriate action for option "py": //! Set packing in y //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Y packing (?). -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2527,9 +2527,9 @@ //! -XOFF+YOFF, and -XOFF-YOFF. Some examples are the following: //! -geometry 400x300, -geometry -100+200, and -geometry 400x300-100+200. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Plot geometry descriptor. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2620,9 +2620,9 @@ // //! File name for plserver tk_file option //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Tk file name. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2650,9 +2650,9 @@ //! e.g., "-dpi 1200" //! Will set both X and Y dpi to 1200 dpi //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg DPI descriptor string. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2698,9 +2698,9 @@ // //! Sets device compression //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Device compression (?). -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2727,9 +2727,9 @@ // //! Sets color table 0 based on a cmap0.pal file. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Name of color map 0 .pal file. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2747,9 +2747,9 @@ // //! Sets color table 1 based on a cmap1.pal file. //! -//! @param opt Not used. +//! @param PL_UNUSED( opt ) Not used. //! @param opt_arg Name of a color map 1 .pal file. -//! @param client_data Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2767,9 +2767,9 @@ // //! Make PLplot portable to all LC_NUMERIC locales. //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! @@ -2801,9 +2801,9 @@ //! self-intersecting, use the even-odd fill rule rather than the //! default nonzero fill rule. //! -//! @param opt Not used. -//! @param opt_arg Not used. -//! @param client_data Not used. +//! @param PL_UNUSED( opt ) Not used. +//! @param PL_UNUSED( opt_arg ) Not used. +//! @param PL_UNUSED( client_data ) Not used. //! //! returns 0. //! Modified: trunk/src/plot3d.c =================================================================== --- trunk/src/plot3d.c 2013-09-18 07:26:10 UTC (rev 12507) +++ trunk/src/plot3d.c 2013-09-18 18:51:03 UTC (rev 12508) @@ -957,13 +957,11 @@ //! or any bitwise OR'd combination, e.g. "MAG_COLOR | DRAW_LINEX" //! @param clevel z values at which to draw contours //! @param nlevel Number of values in clevels -//! @param ixstart Index of first x coordinate to include in plot -//! @param ixn Number of x coordinates to include in plot -//! @param indexymin Array which specifies the min y index for each x -//! index in range ixstart, ixn. -//! @param indexymax Array which specifies the max y index for each x -//! coordinate (following the convention that the upper range limit is one more -//! than actual index limit) for an x index range of ixstart, ixn. +//! @param PL_UNUSED( ixstart ) Not used. +//! @param PL_UNUSED( ixn ) Not used. +//! @param PL_UNUSED( indexymin ) Not used. +//! @param PL_UNUSED( indexymax ) Not used. +//! //-------------------------------------------------------------------------- void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-10-26 20:47:51
|
Revision: 12636 http://sourceforge.net/p/plplot/code/12636 Author: airwin Date: 2013-10-26 20:47:49 +0000 (Sat, 26 Oct 2013) Log Message: ----------- Quiet -O1 -Wuninitialized warnings that all proved to be false alarms. Tested by Alan W. Irwin <ai...@us...> using the install target. No uninitialized warnings occurred other than for the remaining such warnings from the swig-generated bindings code for Python, Lua, and Octave (but not for Java which may give a clue for what to do for those other languages). Modified Paths: -------------- trunk/src/plbuf.c trunk/src/pllegend.c trunk/src/plvect.c Modified: trunk/src/plbuf.c =================================================================== --- trunk/src/plbuf.c 2013-10-26 18:59:10 UTC (rev 12635) +++ trunk/src/plbuf.c 2013-10-26 20:47:49 UTC (rev 12636) @@ -771,8 +771,14 @@ static void rdbuf_image( PLStream *pls ) { + // Unnecessarily initialize dev_iy and dev_z to quiet -O1 + // -Wuninitialized warnings which are false alarms. (If something + // goes wrong with the dev_ix malloc below any further use of + // dev_iy and dev_z does not occur. Similarly, if something goes + // wrong with the dev_iy malloc below any further use of dev_z + // does not occur.) short *dev_ix, *dev_iy = NULL; - unsigned short *dev_z, dev_zmin, dev_zmax; + unsigned short *dev_z = NULL, dev_zmin, dev_zmax; PLINT nptsX, nptsY, npts; PLFLT xmin, ymin, dx, dy; Modified: trunk/src/pllegend.c =================================================================== --- trunk/src/pllegend.c 2013-10-26 18:59:10 UTC (rev 12635) +++ trunk/src/pllegend.c 2013-10-26 20:47:49 UTC (rev 12636) @@ -1531,7 +1531,11 @@ // Min and max values // Assumes that the values array is sorted from smallest to largest // OR from largest to smallest. - PLFLT min_value, max_value, max_abs; + // Unnecessarily initialize min_value, max_value, and max_abs + // to quiet -O1 -Wuninitialized warnings that are false alarms. + // (n_axes is guaranteed to be 1 or greater so that the loops that + // define these values must be executed at least once.) + PLFLT min_value = 0., max_value = 0., max_abs = 0.; // Length of cap in orientation direction in normalized subpage // coordinates and mm. PLFLT cap_extent, cap_extent_mm; Modified: trunk/src/plvect.c =================================================================== --- trunk/src/plvect.c 2013-10-26 18:59:10 UTC (rev 12635) +++ trunk/src/plvect.c 2013-10-26 20:47:49 UTC (rev 12636) @@ -68,7 +68,10 @@ plP_plotvect( PLFLT x, PLFLT y, PLFLT u, PLFLT v, PLFLT scale ) { PLFLT uu, vv, px0, py0, dpx, dpy; - PLINT *a_x, *a_y; + // Unnecessarily initialize a_y to quiet a -O1 -Wuninitialized warning + // which is a false alarm. (If something goes wrong with the + // a_x malloc below any further use of a_y does not occur.) + PLINT *a_x, *a_y = NULL; int j; uu = scale * u; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-11-21 22:19:14
|
Revision: 12733 http://sourceforge.net/p/plplot/code/12733 Author: andrewross Date: 2013-11-21 22:19:11 +0000 (Thu, 21 Nov 2013) Log Message: ----------- Allow the passing of NULL arguments to plsvect which will reset the arrow style to the default. Modified Paths: -------------- trunk/src/plcore.c trunk/src/plvect.c Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2013-11-21 12:43:11 UTC (rev 12732) +++ trunk/src/plcore.c 2013-11-21 22:19:11 UTC (rev 12733) @@ -2224,8 +2224,6 @@ void c_plinit( void ) { - PLFLT def_arrow_x[6] = { -0.5, 0.5, 0.3, 0.5, 0.3, 0.5 }; - PLFLT def_arrow_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; PLFLT lx, ly, xpmm_loc, ypmm_loc, aspect_old, aspect_new; PLINT inc = 0, del = 2000; @@ -2350,7 +2348,8 @@ pllsty( 1 ); plpat( 1, &inc, &del ); - plsvect( def_arrow_x, def_arrow_y, 6, 0 ); + // Set up default arrow style; + plsvect( NULL, NULL, 6, 0 ); // Set clip limits. Modified: trunk/src/plvect.c =================================================================== --- trunk/src/plvect.c 2013-11-21 12:43:11 UTC (rev 12732) +++ trunk/src/plvect.c 2013-11-21 22:19:11 UTC (rev 12733) @@ -40,12 +40,23 @@ c_plsvect( const PLFLT *arrowx, const PLFLT *arrowy, PLINT npts, PLINT fill ) { int i; + PLFLT def_arrow_x[6] = { -0.5, 0.5, 0.3, 0.5, 0.3, 0.5 }; + PLFLT def_arrow_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; if ( plsc->arrow_x ) free_mem( plsc->arrow_x ); if ( plsc->arrow_y ) free_mem( plsc->arrow_y ); + // Reset default arrow if null pointers are passed. + if (arrowx == NULL && arrowy == NULL) + { + arrowx = def_arrow_x; + arrowy = def_arrow_y; + npts = 6; + fill = 0; + } + if ( ( ( plsc->arrow_x = (PLFLT *) malloc( (size_t) npts * sizeof ( PLFLT ) ) ) == NULL ) || ( ( plsc->arrow_y = (PLFLT *) malloc( (size_t) npts * sizeof ( PLFLT ) ) ) == NULL ) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |