From: Andrew R. <and...@us...> - 2005-03-11 18:45:03
|
Update of /cvsroot/plplot/plplot/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9140/src Modified Files: plctrl.c Log Message: Add plHLS_RGB and plRGB_HLS to common API and implement them in the fortran bindings. Update fortran version of example 02 to be consistent with C version. Index: plctrl.c =================================================================== RCS file: /cvsroot/plplot/plplot/src/plctrl.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- plctrl.c 27 Feb 2005 12:04:26 -0000 1.78 +++ plctrl.c 11 Mar 2005 18:44:52 -0000 1.79 @@ -417,7 +417,7 @@ r = coord1[n]; g = coord2[n]; b = coord3[n]; - plRGB_HLS(r, g, b, &h, &l, &s); + c_plRGB_HLS(r, g, b, &h, &l, &s); } plsc->cmap1cp[n].h = h; @@ -494,7 +494,7 @@ while (h < 0.) h += 360.; - plHLS_RGB(h, l, s, &r, &g, &b); + c_plHLS_RGB(h, l, s, &r, &g, &b); plsc->cmap1[i].r = MAX(0, MIN(255, (int) (256. * r))); plsc->cmap1[i].g = MAX(0, MIN(255, (int) (256. * g))); @@ -816,14 +816,14 @@ { PLFLT r, g, b; - plHLS_RGB(h, l, s, &r, &g, &b); + c_plHLS_RGB(h, l, s, &r, &g, &b); plrgb(r, g, b); } /*--------------------------------------------------------------------------*\ * void value() * - * Auxiliary function used by plHLS_RGB(). + * Auxiliary function used by c_plHLS_RGB(). \*--------------------------------------------------------------------------*/ static PLFLT @@ -849,7 +849,7 @@ } /*--------------------------------------------------------------------------*\ - * void plHLS_RGB() + * void c_plHLS_RGB() * * Convert HLS color to RGB color. * Bounds on HLS (input): @@ -863,7 +863,7 @@ \*--------------------------------------------------------------------------*/ void -plHLS_RGB(PLFLT h, PLFLT l, PLFLT s, PLFLT *p_r, PLFLT *p_g, PLFLT *p_b) +c_plHLS_RGB(PLFLT h, PLFLT l, PLFLT s, PLFLT *p_r, PLFLT *p_g, PLFLT *p_b) { PLFLT m1, m2; @@ -880,7 +880,7 @@ } /*--------------------------------------------------------------------------*\ - * void plRGB_HLS() + * void c_plRGB_HLS() * * Convert RGB color to HLS color. * Bounds on RGB (input) is always [0., 1.]. @@ -891,7 +891,7 @@ \*--------------------------------------------------------------------------*/ void -plRGB_HLS(PLFLT r, PLFLT g, PLFLT b, PLFLT *p_h, PLFLT *p_l, PLFLT *p_s) +c_plRGB_HLS(PLFLT r, PLFLT g, PLFLT b, PLFLT *p_h, PLFLT *p_l, PLFLT *p_s) { PLFLT h, l, s, d, rc, gc, bc, rgb_min, rgb_max; |