[Plplot-cvs] SF.net SVN: plplot:[12966] trunk

[<ai...@us...>]

Revision: 12966
          http://sourceforge.net/p/plplot/code/12966
Author:   airwin
Date:     2014-01-29 00:01:50 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Finish the previous renaming of pos ==> intensity for the
plscmap1l and plscmap1la arguments in plplot.h by making the same change
in src/plctrl.c.

Change the argument name of plseed from s ==> seed.

Modified Paths:
--------------
    trunk/include/plplot.h
    trunk/src/plctrl.c

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2014-01-28 20:23:52 UTC (rev 12965)
+++ trunk/include/plplot.h	2014-01-29 00:01:50 UTC (rev 12966)
@@ -1599,7 +1599,7 @@
 // Set seed for internal random number generator
 
 PLDLLIMPEXP void
-c_plseed( unsigned int s );
+c_plseed( unsigned int seed );
 
 // Set the escape character for text strings.
 

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2014-01-28 20:23:52 UTC (rev 12965)
+++ trunk/src/plctrl.c	2014-01-29 00:01:50 UTC (rev 12966)
@@ -632,7 +632,7 @@
 //! The inputs are:
 //! @param itype 0: HLS, 1: RGB
 //! @param npts	number of control points
-//! @param pos[] position for each control point
+//! @param intensity[] intensity index for each control point
 //! @param coord1[] first coordinate for each control point
 //! @param coord2[] second coordinate for each control point
 //! @param coord3[] third coordinate for each control point
@@ -640,7 +640,7 @@
 //! for the associated interval.
 
 void
-c_plscmap1l( PLINT itype, PLINT npts, const PLFLT *pos,
+c_plscmap1l( PLINT itype, PLINT npts, const PLFLT *intensity,
              const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLINT *alt_hue_path )
 {
     int   n;
@@ -652,7 +652,7 @@
         return;
     }
 
-    if ( ( pos[0] != 0 ) || ( pos[npts - 1] != 1 ) )
+    if ( ( intensity[0] != 0 ) || ( intensity[npts - 1] != 1 ) )
     {
         plabort( "plscmap1l: First, last control points must lie on boundary" );
         return;
@@ -692,7 +692,7 @@
         plsc->cmap1cp[n].h = h;
         plsc->cmap1cp[n].l = l;
         plsc->cmap1cp[n].s = s;
-        plsc->cmap1cp[n].p = pos[n];
+        plsc->cmap1cp[n].p = intensity[n];
         plsc->cmap1cp[n].a = 1.0;
 
         if ( alt_hue_path == NULL )
@@ -717,7 +717,7 @@
 //!
 //! @param itype 0: HLS, 1: RGB
 //! @param npts	number of control points
-//! @param pos[] position for each control point
+//! @param intensity[] intensity index for each control point
 //! @param coord1[] first coordinate for each control point
 //! @param coord2[] second coordinate for each control point
 //! @param coord3[] third coordinate for each control point
@@ -726,7 +726,7 @@
 //! for the associated interval.
 
 void
-c_plscmap1la( PLINT itype, PLINT npts, const PLFLT *pos,
+c_plscmap1la( PLINT itype, PLINT npts, const PLFLT *intensity,
               const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *alpha, const PLINT *alt_hue_path )
 {
     int   n;
@@ -738,7 +738,7 @@
         return;
     }
 
-    if ( ( pos[0] != 0 ) || ( pos[npts - 1] != 1 ) )
+    if ( ( intensity[0] != 0 ) || ( intensity[npts - 1] != 1 ) )
     {
         plabort( "plscmap1la: First, last control points must lie on boundary" );
         return;
@@ -778,7 +778,7 @@
         plsc->cmap1cp[n].h = h;
         plsc->cmap1cp[n].l = l;
         plsc->cmap1cp[n].s = s;
-        plsc->cmap1cp[n].p = pos[n];
+        plsc->cmap1cp[n].p = intensity[n];
         plsc->cmap1cp[n].a = alpha[n];
 
         if ( alt_hue_path == NULL )
@@ -3045,13 +3045,13 @@
 //
 //! Set the seed for the random number generator included.
 //!
-//! @param s The random number generator seed value.
+//! @param seed The random number generator seed value.
 //--------------------------------------------------------------------------
 
 void
-c_plseed( unsigned int s )
+c_plseed( unsigned int seed )
 {
-    init_genrand( s );
+    init_genrand( seed );
 }
 
 //--------------------------------------------------------------------------

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.