ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/mgflib/context.c

Comparing ray/src/cv/mgflib/context.c (file contents):
Revision 1.11 by greg, Thu Jun 30 11:07:36 1994 UTC vs.
Revision 1.23 by greg, Mon Aug 28 16:44:12 1995 UTC

#	Line 26 | Line 26 | static C_VERTEX                c_unvertex = C_DEFVERTEX;
26
27		/* the current contexts */
28		C_COLOR         *c_ccolor = &c_uncolor;
29	+	char            *c_ccname = NULL;
30		C_MATERIAL      *c_cmaterial = &c_unmaterial;
31	+	char            *c_cmname = NULL;
32		C_VERTEX        *c_cvertex = &c_unvertex;
33	+	char            *c_cvname = NULL;
34
35		static LUTAB    clr_tab = LU_SINIT(free,free);  /* color lookup table */
36		static LUTAB    mat_tab = LU_SINIT(free,free);  /* material lookup table */
37		static LUTAB    vtx_tab = LU_SINIT(free,free);  /* vertex lookup table */
38
39	<	/* CIE 1931 Standard Observer */
40	<	static C_COLOR  cie_xf = C_CIEX;
41	<	static C_COLOR  cie_yf = C_CIEY;
42	<	static C_COLOR  cie_zf = C_CIEZ;
39	>	/* CIE 1931 Standard Observer curves */
40	>	static C_COLOR  cie_xf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
41	>	{14,42,143,435,1344,2839,3483,3362,2908,1954,956,
42	>	320,49,93,633,1655,2904,4334,5945,7621,9163,10263,
43	>	10622,10026,8544,6424,4479,2835,1649,874,468,227,
44	>	114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230
45	>	};
46	>	static C_COLOR  cie_yf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
47	>	{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,
48	>	5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,
49	>	5030,3810,2650,1750,1070,610,320,170,82,41,21,10,
50	>	5,2,1,1,0,0}, 106856L, .398, .542, 493.525
51	>	};
52	>	static C_COLOR  cie_zf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
53	>	{65,201,679,2074,6456,13856,17471,17721,16692,
54	>	12876,8130,4652,2720,1582,782,422,203,87,39,21,17,
55	>	11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
56	>	106770L, .147, .077, 54.363
57	>	};
58	>	/* Derived CIE 1931 Primaries (imaginary) */
59	>	static C_COLOR  cie_xp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY,
60	>	{-174,-198,-195,-197,-202,-213,-235,-272,-333,
61	>	-444,-688,-1232,-2393,-4497,-6876,-6758,-5256,
62	>	-3100,-815,1320,3200,4782,5998,6861,7408,7754,
63	>	7980,8120,8199,8240,8271,8292,8309,8283,8469,
64	>	8336,8336,8336,8336,8336,8336},
65	>	127424L, 1., .0,
66	>	};
67	>	static C_COLOR  cie_yp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY,
68	>	{-451,-431,-431,-430,-427,-417,-399,-366,-312,
69	>	-204,57,691,2142,4990,8810,9871,9122,7321,5145,
70	>	3023,1123,-473,-1704,-2572,-3127,-3474,-3704,
71	>	-3846,-3927,-3968,-3999,-4021,-4038,-4012,-4201,
72	>	-4066,-4066,-4066,-4066,-4066,-4066},
73	>	-23035L, .0, 1.,
74	>	};
75	>	static C_COLOR  cie_zp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY,
76	>	{4051,4054,4052,4053,4054,4056,4059,4064,4071,
77	>	4074,4056,3967,3677,2933,1492,313,-440,-795,
78	>	-904,-918,-898,-884,-869,-863,-855,-855,-851,
79	>	-848,-847,-846,-846,-846,-845,-846,-843,-845,
80	>	-845,-845,-845,-845,-845},
81	>	36057L, .0, .0,
82	>	};
83
84		static int      setspectrum();
85	+	static int      setbbtemp();
86		static void     mixcolors();
87
88
#	Line 49 | Line 93 | register char  **av;
93		{
94		double  w, wsum;
95		register int    i;
52	–	char    *nm;
96		register LUENT  *lp;
97
98		switch (mg_entity(av[0])) {
#	Line 59 | Line 102 | register char  **av;
102		if (ac == 1) {          /* set unnamed color context */
103		c_uncolor = c_dfcolor;
104		c_ccolor = &c_uncolor;
105	+	c_ccname = NULL;
106		return(MG_OK);
107		}
108	+	if (!isname(av[1]))
109	+	return(MG_EILL);
110		lp = lu_find(&clr_tab, av[1]);  /* lookup context */
111		if (lp == NULL)
112		return(MG_EMEM);
113	+	c_ccname = lp->key;
114		c_ccolor = (C_COLOR *)lp->data;
115		if (ac == 2) {          /* reestablish previous context */
116		if (c_ccolor == NULL)
#	Line 80 | Line 127 | register char  **av;
127		lp->data = (char *)malloc(sizeof(C_COLOR));
128		if (lp->data == NULL)
129		return(MG_EMEM);
130	+	c_ccname = lp->key;
131		c_ccolor = (C_COLOR *)lp->data;
132		c_ccolor->clock = 0;
133		}
86	–	nm = lp->key;
134		i = c_ccolor->clock;
135		if (ac == 3) {          /* use default template */
136		*c_ccolor = c_dfcolor;
90	–	c_ccolor->name = nm;
137		c_ccolor->clock = i + 1;
138		return(MG_OK);
139		}
#	Line 97 | Line 143 | register char  **av;
143		if (lp->data == NULL)
144		return(MG_EUNDEF);
145		*c_ccolor = *(C_COLOR *)lp->data;
100	–	c_ccolor->name = nm;
146		c_ccolor->clock = i + 1;
147		return(MG_OK);
148		case MG_E_CXY:          /* assign CIE XY value */
149		if (ac != 3)
150		return(MG_EARGC);
151	<	if (!isflt(av[1]) || !isflt(av[2]))
151	>	if (!isflt(av[1]) | !isflt(av[2]))
152		return(MG_ETYPE);
153		c_ccolor->cx = atof(av[1]);
154		c_ccolor->cy = atof(av[2]);
#	Line 116 | Line 161 | register char  **av;
161		case MG_E_CSPEC:        /* assign spectral values */
162		if (ac < 5)
163		return(MG_EARGC);
164	<	if (!isint(av[1]) || !isint(av[2]))
164	>	if (!isflt(av[1]) | !isflt(av[2]))
165		return(MG_ETYPE);
166	<	return(setspectrum(c_ccolor, atoi(av[1]), atoi(av[2]),
166	>	return(setspectrum(c_ccolor, atof(av[1]), atof(av[2]),
167		ac-3, av+3));
168	+	case MG_E_CCT:          /* assign black body spectrum */
169	+	if (ac != 2)
170	+	return(MG_EARGC);
171	+	if (!isflt(av[1]))
172	+	return(MG_ETYPE);
173	+	return(setbbtemp(c_ccolor, atof(av[1])));
174		case MG_E_CMIX:         /* mix colors */
175		if (ac < 5 || (ac-1)%2)
176		return(MG_EARGC);
#	Line 160 | Line 211 | int    ac;
211		register char   **av;
212		{
213		int     i;
163	–	char    *nm;
214		register LUENT  *lp;
215
216		switch (mg_entity(av[0])) {
#	Line 170 | Line 220 | register char  **av;
220		if (ac == 1) {          /* set unnamed material context */
221		c_unmaterial = c_dfmaterial;
222		c_cmaterial = &c_unmaterial;
223	+	c_cmname = NULL;
224		return(MG_OK);
225		}
226	+	if (!isname(av[1]))
227	+	return(MG_EILL);
228		lp = lu_find(&mat_tab, av[1]);  /* lookup context */
229		if (lp == NULL)
230		return(MG_EMEM);
231	+	c_cmname = lp->key;
232		c_cmaterial = (C_MATERIAL *)lp->data;
233		if (ac == 2) {          /* reestablish previous context */
234		if (c_cmaterial == NULL)
#	Line 191 | Line 245 | register char  **av;
245		lp->data = (char *)malloc(sizeof(C_MATERIAL));
246		if (lp->data == NULL)
247		return(MG_EMEM);
248	+	c_cmname = lp->key;
249		c_cmaterial = (C_MATERIAL *)lp->data;
250		c_cmaterial->clock = 0;
251		}
197	–	nm = lp->key;
252		i = c_cmaterial->clock;
253		if (ac == 3) {          /* use default template */
254		*c_cmaterial = c_dfmaterial;
201	–	c_cmaterial->name = nm;
255		c_cmaterial->clock = i + 1;
256		return(MG_OK);
257		}
#	Line 208 | Line 261 | register char  **av;
261		if (lp->data == NULL)
262		return(MG_EUNDEF);
263		*c_cmaterial = *(C_MATERIAL *)lp->data;
211	–	c_cmaterial->name = nm;
264		c_cmaterial->clock = i + 1;
265		return(MG_OK);
266	+	case MG_E_IR:           /* set index of refraction */
267	+	if (ac != 3)
268	+	return(MG_EARGC);
269	+	if (!isflt(av[1]) | !isflt(av[2]))
270	+	return(MG_ETYPE);
271	+	c_cmaterial->nr = atof(av[1]);
272	+	c_cmaterial->ni = atof(av[2]);
273	+	if (c_cmaterial->nr <= FTINY)
274	+	return(MG_EILL);
275	+	c_cmaterial->clock++;
276	+	return(MG_OK);
277		case MG_E_RD:           /* set diffuse reflectance */
278		if (ac != 2)
279		return(MG_EARGC);
#	Line 247 | Line 310 | register char  **av;
310		case MG_E_RS:           /* set specular reflectance */
311		if (ac != 3)
312		return(MG_EARGC);
313	<	if (!isflt(av[1]) || !isflt(av[2]))
313	>	if (!isflt(av[1]) | !isflt(av[2]))
314		return(MG_ETYPE);
315		c_cmaterial->rs = atof(av[1]);
316		c_cmaterial->rs_a = atof(av[2]);
#	Line 260 | Line 323 | register char  **av;
323		case MG_E_TS:           /* set specular transmittance */
324		if (ac != 3)
325		return(MG_EARGC);
326	<	if (!isflt(av[1]) || !isflt(av[2]))
326	>	if (!isflt(av[1]) | !isflt(av[2]))
327		return(MG_ETYPE);
328		c_cmaterial->ts = atof(av[1]);
329		c_cmaterial->ts_a = atof(av[2]);
#	Line 270 | Line 333 | register char  **av;
333		c_cmaterial->ts_c = *c_ccolor;
334		c_cmaterial->clock++;
335		return(MG_OK);
336	+	case MG_E_SIDES:        /* set number of sides */
337	+	if (ac != 2)
338	+	return(MG_EARGC);
339	+	if (!isint(av[1]))
340	+	return(MG_ETYPE);
341	+	i = atoi(av[1]);
342	+	if (i == 1)
343	+	c_cmaterial->sided = 1;
344	+	else if (i == 2)
345	+	c_cmaterial->sided = 0;
346	+	else
347	+	return(MG_EILL);
348	+	c_cmaterial->clock++;
349	+	return(MG_OK);
350		}
351		return(MG_EUNK);
352		}
#	Line 281 | Line 358 | int    ac;
358		register char   **av;
359		{
360		int     i;
284	–	char    *nm;
361		register LUENT  *lp;
362
363		switch (mg_entity(av[0])) {
#	Line 291 | Line 367 | register char  **av;
367		if (ac == 1) {          /* set unnamed vertex context */
368		c_unvertex = c_dfvertex;
369		c_cvertex = &c_unvertex;
370	+	c_cvname = NULL;
371		return(MG_OK);
372		}
373	+	if (!isname(av[1]))
374	+	return(MG_EILL);
375		lp = lu_find(&vtx_tab, av[1]);  /* lookup context */
376		if (lp == NULL)
377		return(MG_EMEM);
378	+	c_cvname = lp->key;
379		c_cvertex = (C_VERTEX *)lp->data;
380		if (ac == 2) {          /* reestablish previous context */
381		if (c_cvertex == NULL)
#	Line 312 | Line 392 | register char  **av;
392		lp->data = (char *)malloc(sizeof(C_VERTEX));
393		if (lp->data == NULL)
394		return(MG_EMEM);
395	+	c_cvname = lp->key;
396		c_cvertex = (C_VERTEX *)lp->data;
397		}
317	–	nm = lp->key;
398		i = c_cvertex->clock;
399		if (ac == 3) {          /* use default template */
400		*c_cvertex = c_dfvertex;
321	–	c_cvertex->name = nm;
401		c_cvertex->clock = i + 1;
402		return(MG_OK);
403		}
#	Line 328 | Line 407 | register char  **av;
407		if (lp->data == NULL)
408		return(MG_EUNDEF);
409		*c_cvertex = *(C_VERTEX *)lp->data;
331	–	c_cvertex->name = nm;
410		c_cvertex->clock = i + 1;
411		return(MG_OK);
412		case MG_E_POINT:        /* set point */
413		if (ac != 4)
414		return(MG_EARGC);
415	<	if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
415	>	if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
416		return(MG_ETYPE);
417		c_cvertex->p[0] = atof(av[1]);
418		c_cvertex->p[1] = atof(av[2]);
#	Line 344 | Line 422 | register char  **av;
422		case MG_E_NORMAL:       /* set normal */
423		if (ac != 4)
424		return(MG_EARGC);
425	<	if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
425	>	if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
426		return(MG_ETYPE);
427		c_cvertex->n[0] = atof(av[1]);
428		c_cvertex->n[1] = atof(av[2]);
#	Line 362 | Line 440 | c_clearall()                   /* empty context tables */
440		{
441		c_uncolor = c_dfcolor;
442		c_ccolor = &c_uncolor;
443	+	c_ccname = NULL;
444		lu_done(&clr_tab);
445		c_unmaterial = c_dfmaterial;
446		c_cmaterial = &c_unmaterial;
447	+	c_cmname = NULL;
448		lu_done(&mat_tab);
449		c_unvertex = c_dfvertex;
450		c_cvertex = &c_unvertex;
451	+	c_cvname = NULL;
452		lu_done(&vtx_tab);
453		}
454
#	Line 428 | Line 509 | int    fl;
509		double  x, y, z;
510		register int    i;
511
512	<	if (clr->flags & fl)            /* already done */
512	>	fl &= ~clr->flags;                      /* ignore what's done */
513	>	if (!fl)                                /* everything's done! */
514		return;
515		if (!(clr->flags & (C_CSXY|C_CSSPEC)))  /* nothing set! */
516		*clr = c_dfcolor;
517	<	else if (fl & C_CSXY) {         /* cspec -> cxy */
517	>	if (fl & C_CSXY) {              /* cspec -> cxy */
518		x = y = z = 0.;
519		for (i = 0; i < C_CNSS; i++) {
520		x += cie_xf.ssamp[i] * clr->ssamp[i];
521		y += cie_yf.ssamp[i] * clr->ssamp[i];
522		z += cie_zf.ssamp[i] * clr->ssamp[i];
523		}
524	+	x /= (double)cie_xf.ssum;
525	+	y /= (double)cie_yf.ssum;
526	+	z /= (double)cie_zf.ssum;
527		z += x + y;
528		clr->cx = x / z;
529		clr->cy = y / z;
530		clr->flags |= C_CSXY;
531	<	} else {                        /* cxy -> cspec */
532	<	z = (cie_xf.ssum + cie_yf.ssum + cie_zf.ssum) / 3.;
533	<	x = clr->cx * z / cie_xf.ssum;
534	<	y = clr->cy * z / cie_yf.ssum;
450	<	z = (1. - clr->cx - clr->cy) * z / cie_zf.ssum;
531	>	} else if (fl & C_CSSPEC) {     /* cxy -> cspec */
532	>	x = clr->cx;
533	>	y = clr->cy;
534	>	z = 1. - x - y;
535		clr->ssum = 0;
536	<	for (i = 0; i < C_CNSS; i++)
537	<	clr->ssum += clr->ssamp[i] =
538	<	x * cie_xf.ssamp[i] +
539	<	y * cie_yf.ssamp[i] +
540	<	z * cie_zf.ssamp[i] ;
536	>	for (i = 0; i < C_CNSS; i++) {
537	>	clr->ssamp[i] = x*cie_xp.ssamp[i] + y*cie_yp.ssamp[i]
538	>	+ z*cie_zp.ssamp[i] + .5;
539	>	if (clr->ssamp[i] < 0)          /* out of gamut! */
540	>	clr->ssamp[i] = 0;
541	>	else
542	>	clr->ssum += clr->ssamp[i];
543	>	}
544		clr->flags |= C_CSSPEC;
545		}
546	+	if (fl & C_CSEFF) {             /* compute efficacy */
547	+	if (clr->flags & C_CSSPEC) {            /* from spectrum */
548	+	y = 0.;
549	+	for (i = 0; i < C_CNSS; i++)
550	+	y += cie_yf.ssamp[i] * clr->ssamp[i];
551	+	clr->eff = C_CLPWM * y / clr->ssum;
552	+	} else /* clr->flags & C_CSXY */ {      /* from (x,y) */
553	+	clr->eff = clr->cx*cie_xf.eff + clr->cy*cie_yf.eff +
554	+	(1. - clr->cx - clr->cy)*cie_zf.eff;
555	+	}
556	+	clr->flags |= C_CSEFF;
557	+	}
558		}
559
560
561		static int
562		setspectrum(clr, wlmin, wlmax, ac, av)  /* convert a spectrum */
563		register C_COLOR        *clr;
564	<	int     wlmin, wlmax;
564	>	double  wlmin, wlmax;
565		int     ac;
566		char    **av;
567		{
568		double  scale;
569	<	float   *va;
570	<	register int    i;
571	<	int     wl, pos;
569	>	float   va[C_CNSS];
570	>	register int    i, pos;
571	>	int     n, imax;
572	>	int     wl;
573		double  wl0, wlstep;
574	<
575	<	if (wlmin < C_CMINWL || wlmin >= wlmax || wlmax > C_CMAXWL)
574	>	double  boxpos, boxstep;
575	>	/* check bounds */
576	>	if (wlmax <= C_CMINWL | wlmax <= wlmin | wlmin >= C_CMAXWL)
577		return(MG_EILL);
578	<	if ((va = (float *)malloc(ac*sizeof(float))) == NULL)
579	<	return(MG_EMEM);
578	>	wlstep = (wlmax - wlmin)/(ac-1);
579	>	while (wlmin < C_CMINWL) {
580	>	wlmin += wlstep;
581	>	ac--; av++;
582	>	}
583	>	while (wlmax > C_CMAXWL) {
584	>	wlmax -= wlstep;
585	>	ac--;
586	>	}
587	>	imax = ac;                      /* box filter if necessary */
588	>	boxpos = 0;
589	>	boxstep = 1;
590	>	if (wlstep < C_CWLI) {
591	>	imax = (wlmax - wlmin)/C_CWLI + (1-FTINY);
592	>	boxpos = (wlmin - C_CMINWL)/C_CWLI;
593	>	boxstep = wlstep/C_CWLI;
594	>	wlstep = C_CWLI;
595	>	}
596		scale = 0.;                     /* get values and maximum */
597	<	for (i = 0; i < ac; i++) {
598	<	if (!isflt(av[i]))
599	<	return(MG_ETYPE);
600	<	va[i] = atof(av[i]);
601	<	if (va[i] < 0.)
602	<	return(MG_EILL);
597	>	pos = 0;
598	>	for (i = 0; i < imax; i++) {
599	>	va[i] = 0.; n = 0;
600	>	while (boxpos < i+.5 && pos < ac) {
601	>	if (!isflt(av[pos]))
602	>	return(MG_ETYPE);
603	>	va[i] += atof(av[pos++]);
604	>	n++;
605	>	boxpos += boxstep;
606	>	}
607	>	if (n > 1)
608	>	va[i] /= (double)n;
609		if (va[i] > scale)
610		scale = va[i];
611	+	else if (va[i] < -scale)
612	+	scale = -va[i];
613		}
614	<	if (scale == 0.)
614	>	if (scale <= FTINY)
615		return(MG_EILL);
616		scale = C_CMAXV / scale;
617		clr->ssum = 0;                  /* convert to our spacing */
618		wl0 = wlmin;
494	–	wlstep = (double)(wlmax - wlmin)/(ac-1);
619		pos = 0;
620		for (i = 0, wl = C_CMINWL; i < C_CNSS; i++, wl += C_CWLI)
621	<	if (wl < wlmin || wl > wlmax)
621	>	if (wl < wlmin | wl > wlmax)
622		clr->ssamp[i] = 0;
623		else {
624		while (wl0 + wlstep < wl+FTINY) {
625		wl0 += wlstep;
626		pos++;
627		}
628	<	if (wl+FTINY >= wl0 && wl-FTINY <= wl0)
629	<	clr->ssamp[i] = scale*va[pos];
628	>	if (wl+FTINY >= wl0 & wl-FTINY <= wl0)
629	>	clr->ssamp[i] = scale*va[pos] + .5;
630		else            /* interpolate if necessary */
631	<	clr->ssamp[i] = scale / wlstep *
631	>	clr->ssamp[i] = .5 + scale / wlstep *
632		( va[pos]*(wl0+wlstep - wl) +
633		va[pos+1]*(wl - wl0) );
634		clr->ssum += clr->ssamp[i];
635		}
636		clr->flags = C_CDSPEC|C_CSSPEC;
637		clr->clock++;
514	–	free((MEM_PTR)va);
638		return(MG_OK);
639		}
640
#	Line 526 | Line 649 | double w1, w2;
649		register int    i;
650
651		if ((c1->flags|c2->flags) & C_CDSPEC) {         /* spectral mixing */
652	<	c_ccvt(c1, C_CSSPEC);
653	<	c_ccvt(c2, C_CSSPEC);
654	<	w1 /= (double)c1->ssum;
655	<	w2 /= (double)c2->ssum;
652	>	c_ccvt(c1, C_CSSPEC|C_CSEFF);
653	>	c_ccvt(c2, C_CSSPEC|C_CSEFF);
654	>	w1 /= c1->eff*c1->ssum;
655	>	w2 /= c2->eff*c2->ssum;
656		scale = 0.;
657		for (i = 0; i < C_CNSS; i++) {
658		cmix[i] = w1*c1->ssamp[i] + w2*c2->ssamp[i];
#	Line 550 | Line 673 | double w1, w2;
673		cres->flags = C_CDXY|C_CSXY;
674		}
675		}
676	+
677	+
678	+	#define C1              3.741832e-16    /* W-m^2 */
679	+	#define C2              1.4388e-2       /* m-K */
680	+
681	+	#define bbsp(l,t)       (C1/((l)*(l)*(l)*(l)*(l)*(exp(C2/((t)*(l)))-1.)))
682	+	#define bblm(t)         (C2/5./(t))
683	+
684	+	static int
685	+	setbbtemp(clr, tk)              /* set black body spectrum */
686	+	register C_COLOR        *clr;
687	+	double  tk;
688	+	{
689	+	double  sf, wl;
690	+	register int    i;
691	+
692	+	if (tk < 1000)
693	+	return(MG_EILL);
694	+	wl = bblm(tk);                  /* scalefactor based on peak */
695	+	if (wl < C_CMINWL*1e-9)
696	+	wl = C_CMINWL*1e-9;
697	+	else if (wl > C_CMAXWL*1e-9)
698	+	wl = C_CMAXWL*1e-9;
699	+	sf = C_CMAXV/bbsp(wl,tk);
700	+	clr->ssum = 0;
701	+	for (i = 0; i < C_CNSS; i++) {
702	+	wl = (C_CMINWL + i*C_CWLI)*1e-9;
703	+	clr->ssum += clr->ssamp[i] = sf*bbsp(wl,tk) + .5;
704	+	}
705	+	clr->flags = C_CDSPEC|C_CSSPEC;
706	+	clr->clock++;
707	+	return(MG_OK);
708	+	}
709	+
710	+	#undef  C1
711	+	#undef  C2
712	+	#undef  bbsp
713	+	#undef  bblm

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)