ViewVC Help

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

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

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.14 by greg, Fri Mar 10 15:16:07 1995 UTC vs.
Revision 1.26 by gregl, Mon Dec 15 09:41:37 1997 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1994 Regents of the University of California */
1	>	/* Copyright (c) 1996 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10
11		#include <stdio.h>
12		#include <math.h>
13	+	#include <stdlib.h>
14		#include <ctype.h>
15		#include <string.h>
16		#include "parser.h"
#	Line 27 | Line 28 | char   mg_ename[MG_NENTITIES][MG_MAXELEN] = MG_NAMELIST;
28
29		int     (*mg_ehand[MG_NENTITIES])();
30
31	+	/* Handler routine for unknown entities */
32	+
33	+	int     (*mg_uhand)() = mg_defuhand;
34	+
35	+	unsigned        mg_nunknown;    /* count of unknown entities */
36	+
37		/* error messages */
38
39		char    *mg_err[MG_NERRS] = MG_ERRLIST;
#	Line 57 | Line 64 | int    mg_nqcdivs = MG_NQCD;   /* number of divisions per q
64
65		static int      e_any_toss(),           /* discard unneeded entity */
66		e_ies(),                /* IES luminaire file */
60	–	e_include(),            /* include file */
61	–	e_sph(),                /* sphere */
67		e_cct(),                /* color temperature */
68		e_cmix(),               /* color mixtures */
69	<	e_cspec(),              /* color spectra */
65	<	e_cyl(),                /* cylinder */
66	<	e_cone(),               /* cone */
67	<	e_prism(),              /* prism */
68	<	e_ring(),               /* ring */
69	<	e_torus();              /* torus */
69	>	e_cspec();              /* color spectra */
70
71		/* alternate handler support functions */
72
#	Line 89 | Line 89 | mg_init()                      /* initialize alternate entity handlers */
89		mg_ehand[MG_E_INCLUDE] = e_include;
90		if (mg_ehand[MG_E_SPH] == NULL) {
91		mg_ehand[MG_E_SPH] = e_sph;
92	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
92	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
93		} else
94	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
94	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
95		if (mg_ehand[MG_E_CYL] == NULL) {
96		mg_ehand[MG_E_CYL] = e_cyl;
97	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
97	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
98		} else
99	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
99	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
100		if (mg_ehand[MG_E_CONE] == NULL) {
101		mg_ehand[MG_E_CONE] = e_cone;
102	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
102	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
103		} else
104	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
104	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
105		if (mg_ehand[MG_E_RING] == NULL) {
106		mg_ehand[MG_E_RING] = e_ring;
107	<	ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
107	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
108		} else
109	<	uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
109	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
110		if (mg_ehand[MG_E_PRISM] == NULL) {
111		mg_ehand[MG_E_PRISM] = e_prism;
112	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
112	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
113		} else
114	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
114	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
115		if (mg_ehand[MG_E_TORUS] == NULL) {
116		mg_ehand[MG_E_TORUS] = e_torus;
117	<	ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
117	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
118		} else
119	<	uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
119	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
120	>	if (mg_ehand[MG_E_FACE] == NULL)
121	>	mg_ehand[MG_E_FACE] = mg_ehand[MG_E_FACEH];
122	>	else if (mg_ehand[MG_E_FACEH] == NULL)
123	>	mg_ehand[MG_E_FACEH] = e_faceh;
124		if (mg_ehand[MG_E_COLOR] != NULL) {
125		if (mg_ehand[MG_E_CMIX] == NULL) {
126		mg_ehand[MG_E_CMIX] = e_cmix;
127	<	ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
127	>	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
128		}
129		if (mg_ehand[MG_E_CSPEC] == NULL) {
130		mg_ehand[MG_E_CSPEC] = e_cspec;
131	<	ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
131	>	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
132		}
133		if (mg_ehand[MG_E_CCT] == NULL) {
134		mg_ehand[MG_E_CCT] = e_cct;
135	<	ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
135	>	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
136		}
137		}
138		/* check for consistency */
139		if (mg_ehand[MG_E_FACE] != NULL)
140	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
140	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
141		if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
142		mg_ehand[MG_E_CMIX] != NULL)
143	<	uneed |= 1<<MG_E_COLOR;
143	>	uneed |= 1L<<MG_E_COLOR;
144		if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
145	+	mg_ehand[MG_E_IR] != NULL ||
146		mg_ehand[MG_E_ED] != NULL ||
147		mg_ehand[MG_E_RS] != NULL ||
148		mg_ehand[MG_E_TS] != NULL ||
149		mg_ehand[MG_E_SIDES] != NULL)
150	<	uneed |= 1<<MG_E_MATERIAL;
150	>	uneed |= 1L<<MG_E_MATERIAL;
151		for (i = 0; i < MG_NENTITIES; i++)
152	<	if (uneed & 1<<i && mg_ehand[i] == NULL) {
152	>	if (uneed & 1L<<i && mg_ehand[i] == NULL) {
153		fprintf(stderr, "Missing support for \"%s\" entity\n",
154		mg_ename[i]);
155		exit(1);
156		}
157		/* add support as needed */
158	<	if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
158	>	if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
159		e_supp[MG_E_VERTEX] = c_hvertex;
160	<	if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
160	>	if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
161		e_supp[MG_E_POINT] = c_hvertex;
162	<	if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
162	>	if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
163		e_supp[MG_E_NORMAL] = c_hvertex;
164	<	if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
164	>	if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
165		e_supp[MG_E_COLOR] = c_hcolor;
166	<	if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
166	>	if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
167		e_supp[MG_E_CXY] = c_hcolor;
168	<	if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
168	>	if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
169		e_supp[MG_E_CSPEC] = c_hcolor;
170	<	if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
170	>	if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
171		e_supp[MG_E_CMIX] = c_hcolor;
172	<	if (ineed & 1<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
172	>	if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
173		e_supp[MG_E_CCT] = c_hcolor;
174		/* discard remaining entities */
175		for (i = 0; i < MG_NENTITIES; i++)
#	Line 202 | Line 207 | char   **av;
207		{
208		int     rv;
209
210	<	if (en < 0 && (en = mg_entity(av[0])) < 0)
210	>	if (en < 0 && (en = mg_entity(av[0])) < 0) {    /* unknown entity */
211	>	if (mg_uhand != NULL)
212	>	return((*mg_uhand)(ac, av));
213		return(MG_EUNK);
214	<	if (e_supp[en] != NULL) {
214	>	}
215	>	if (e_supp[en] != NULL) {                       /* support handler */
216		if ((rv = (*e_supp[en])(ac, av)) != MG_OK)
217		return(rv);
218		}
219	<	return((*mg_ehand[en])(ac, av));
219	>	return((*mg_ehand[en])(ac, av));                /* assigned handler */
220		}
221
222
#	Line 218 | Line 226 | register MG_FCTXT      *ctx;
226		char    *fn;
227		{
228		static int      nfids;
221	–	int     olen;
229		register char   *cp;
230
231		ctx->fid = ++nfids;
#	Line 231 | Line 238 | char   *fn;
238		return(MG_OK);
239		}
240		/* get name relative to this context */
241	<	if (mg_file != NULL &&
235	<	(cp = strrchr(mg_file->fname, '/')) != NULL)
236	<	olen = cp - mg_file->fname + 1;
237	<	else
238	<	olen = 0;
239	<	if (olen)
241	>	if (mg_file != NULL && (cp = strrchr(mg_file->fname, '/')) != NULL) {
242		strcpy(ctx->fname, mg_file->fname);
243	<	strcpy(ctx->fname+olen, fn);
243	>	strcpy(ctx->fname+(cp-mg_file->fname+1), fn);
244	>	} else
245	>	strcpy(ctx->fname, fn);
246		ctx->fp = fopen(ctx->fname, "r");
247		if (ctx->fp == NULL)
248		return(MG_ENOFILE);
#	Line 254 | Line 258 | mg_close()                     /* close input file */
258		register MG_FCTXT       *ctx = mg_file;
259
260		mg_file = ctx->prev;            /* restore enclosing context */
261	<	if (ctx->fp == stdin)
262	<	return;                 /* don't close standard input */
259	<	fclose(ctx->fp);
261	>	if (ctx->fp != stdin)           /* close file if it's a file */
262	>	fclose(ctx->fp);
263		}
264
265
#	Line 264 | Line 267 | void
267		mg_fgetpos(pos)                 /* get current position in input file */
268		register MG_FPOS        *pos;
269		{
267	–	extern long     ftell();
268	–
270		pos->fid = mg_file->fid;
271		pos->lineno = mg_file->lineno;
272		pos->offset = ftell(mg_file->fp);
#	Line 298 | Line 299 | mg_read()                      /* read next line from file */
299		if (fgets(mg_file->inpline+len,
300		MG_MAXLINE-len, mg_file->fp) == NULL)
301		return(len);
301	–	mg_file->lineno++;
302		len += strlen(mg_file->inpline+len);
303	<	if (len > 1 && mg_file->inpline[len-2] == '\\')
304	<	mg_file->inpline[--len-1] = ' ';
305	<	} while (mg_file->inpline[len]);
303	>	if (len >= MG_MAXLINE-1)
304	>	return(len);
305	>	mg_file->lineno++;
306	>	} while (len > 1 && mg_file->inpline[len-2] == '\\');
307
308		return(len);
309		}
#	Line 313 | Line 314 | mg_parse()                     /* parse current input line */
314		{
315		char    abuf[MG_MAXLINE];
316		char    *argv[MG_MAXARGC];
317	<	int     en;
318	<	register char   *cp, **ap;
319	<
320	<	strcpy(cp=abuf, mg_file->inpline);
321	<	ap = argv;                      /* break into words */
317	>	register char   *cp, *cp2, **ap;
318	>	/* copy line, removing escape chars */
319	>	cp = abuf; cp2 = mg_file->inpline;
320	>	while ((*cp++ = *cp2++))
321	>	if (cp2[0] == '\n' && cp2[-1] == '\\')
322	>	cp--;
323	>	cp = abuf; ap = argv;           /* break into words */
324		for ( ; ; ) {
325		while (isspace(*cp))
326		*cp++ = '\0';
#	Line 343 | Line 346 | char   *fn;
346		{
347		MG_FCTXT        cntxt;
348		int     rval;
349	+	register int    nbr;
350
351		if ((rval = mg_open(&cntxt, fn)) != MG_OK) {
352		fprintf(stderr, "%s: %s\n", fn, mg_err[rval]);
353		return(rval);
354		}
355	<	while (mg_read())               /* parse each line */
355	>	while ((nbr = mg_read()) > 0) { /* parse each line */
356	>	if (nbr >= MG_MAXLINE-1) {
357	>	fprintf(stderr, "%s: %d: %s\n", cntxt.fname,
358	>	cntxt.lineno, mg_err[rval=MG_ELINE]);
359	>	break;
360	>	}
361		if ((rval = mg_parse()) != MG_OK) {
362		fprintf(stderr, "%s: %d: %s:\n%s", cntxt.fname,
363		cntxt.lineno, mg_err[rval],
364		cntxt.inpline);
365		break;
366		}
367	+	}
368		mg_close();
369		return(rval);
370		}
371
372
373	+	int
374	+	mg_defuhand(ac, av)             /* default handler for unknown entities */
375	+	int     ac;
376	+	char    **av;
377	+	{
378	+	if (mg_nunknown++ == 0)         /* report first incident */
379	+	fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
380	+	mg_file->lineno, mg_err[MG_EUNK], av[0]);
381	+	return(MG_OK);
382	+	}
383	+
384	+
385		void
386		mg_clear()                      /* clear parser history */
387		{
388		c_clearall();                   /* clear context tables */
389	<	mg_file = NULL;                 /* reset our context */
389	>	while (mg_file != NULL)         /* reset our file context */
390	>	mg_close();
391		}
392
393
#	Line 382 | Line 405 | char   **av;
405		}
406
407
408	<	static int
408	>	int
409		e_include(ac, av)               /* include file */
410		int     ac;
411		char    **av;
412		{
413		char    *xfarg[MG_MAXARGC];
414		MG_FCTXT        ictx;
415	<	int     rv;
415	>	XF_SPEC *xf_orig = xf_context;
416	>	register int    rv;
417
418		if (ac < 2)
419		return(MG_EARGC);
#	Line 402 | Line 426 | char   **av;
426		for (i = 1; i < ac-1; i++)
427		xfarg[i] = av[i+1];
428		xfarg[ac-1] = NULL;
429	<	if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
429	>	if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK) {
430	>	mg_close();
431		return(rv);
432	+	}
433		}
434	<	while (!feof(mg_file->fp)) {
435	<	while (mg_read())
434	>	do {
435	>	while ((rv = mg_read()) > 0) {
436	>	if (rv >= MG_MAXLINE-1) {
437	>	fprintf(stderr, "%s: %d: %s\n", ictx.fname,
438	>	ictx.lineno, mg_err[MG_ELINE]);
439	>	mg_close();
440	>	return(MG_EINCL);
441	>	}
442		if ((rv = mg_parse()) != MG_OK) {
443		fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
444		ictx.lineno, mg_err[rv],
#	Line 414 | Line 446 | char   **av;
446		mg_close();
447		return(MG_EINCL);
448		}
449	+	}
450		if (ac > 2)
451	<	if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
451	>	if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK) {
452	>	mg_close();
453		return(rv);
454	<	}
454	>	}
455	>	} while (xf_context != xf_orig);
456		mg_close();
457		return(MG_OK);
458		}
459
460
461	+	int
462	+	e_faceh(ac, av)                 /* replace face+holes with single contour */
463	+	int     ac;
464	+	char    **av;
465	+	{
466	+	char    *newav[MG_MAXARGC];
467	+	int     lastp = 0;
468	+	register int    i, j;
469	+
470	+	newav[0] = mg_ename[MG_E_FACE];
471	+	for (i = 1; i < ac; i++)
472	+	if (av[i][0] == '-') {
473	+	if (i < 4)
474	+	return(MG_EARGC);
475	+	if (i >= ac-1)
476	+	break;
477	+	if (!lastp)
478	+	lastp = i-1;
479	+	for (j = i+1; j < ac-1 && av[j+1][0] != '-'; j++)
480	+	;
481	+	if (j - i < 3)
482	+	return(MG_EARGC);
483	+	newav[i] = av[j];       /* connect hole loop */
484	+	} else
485	+	newav[i] = av[i];       /* hole or perimeter vertex */
486	+	if (lastp)
487	+	newav[i++] = av[lastp];         /* finish seam to outside */
488	+	newav[i] = NULL;
489	+	return(mg_handle(MG_E_FACE, i, newav));
490	+	}
491	+
492	+
493		static void
494		make_axes(u, v, w)              /* compute u and v given w (normalized) */
495		FVECT   u, v, w;
#	Line 440 | Line 507 | FVECT  u, v, w;
507		}
508
509
510	<	static int
510	>	int
511		e_sph(ac, av)                   /* expand a sphere into cones */
512		int     ac;
513		char    **av;
#	Line 492 | Line 559 | char   **av;
559		}
560
561
562	<	static int
562	>	int
563		e_torus(ac, av)                 /* expand a torus into cones */
564		int     ac;
565		char    **av;
#	Line 584 | Line 651 | char   **av;
651		}
652
653
654	<	static int
654	>	int
655		e_cyl(ac, av)                   /* replace a cylinder with equivalent cone */
656		int     ac;
657		char    **av;
#	Line 601 | Line 668 | char   **av;
668		}
669
670
671	<	static int
671	>	int
672		e_ring(ac, av)                  /* turn a ring into polygons */
673		int     ac;
674		char    **av;
#	Line 699 | Line 766 | char   **av;
766		}
767
768
769	<	static int
769	>	int
770		e_cone(ac, av)                  /* turn a cone into polygons */
771		int     ac;
772		char    **av;
#	Line 714 | Line 781 | char   **av;
781		static char     *p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
782		static char     *n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
783		static char     *fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
784	+	char    *v1n;
785		register C_VERTEX       *cv1, *cv2;
786		register int    i, j;
787		FVECT   u, v, w;
#	Line 729 | Line 797 | char   **av;
797		if ((cv1 = c_getvert(av[1])) == NULL ||
798		(cv2 = c_getvert(av[3])) == NULL)
799		return(MG_EUNDEF);
800	+	v1n = av[1];
801		if (!isflt(av[2]) || !isflt(av[4]))
802		return(MG_ETYPE);
803		rad1 = atof(av[2]);
#	Line 739 | Line 808 | char   **av;
808		if (rad2 == 0.)
809		return(MG_EILL);
810		} else if (rad2 != 0.) {
811	<	if (rad1 < 0. ^ rad2 < 0.)
811	>	if ((rad1 < 0.) ^ (rad2 < 0.))
812		return(MG_EILL);
813		} else {                        /* swap */
814		C_VERTEX        *cv;
#	Line 747 | Line 816 | char   **av;
816		cv = cv1;
817		cv1 = cv2;
818		cv2 = cv;
819	+	v1n = av[3];
820		d = rad1;
821		rad1 = rad2;
822		rad2 = d;
#	Line 780 | Line 850 | char   **av;
850		if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
851		return(rv);
852		if (rad1 == 0.) {               /* triangles */
853	<	v1ent[3] = av[1];
853	>	v1ent[3] = v1n;
854		if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
855		return(rv);
856		for (j = 0; j < 3; j++)
#	Line 866 | Line 936 | char   **av;
936		}
937
938
939	<	static int
939	>	int
940		e_prism(ac, av)                 /* turn a prism into polygons */
941		int     ac;
942		char    **av;
#	Line 978 | Line 1048 | put_cxy()                      /* put out current xy chromaticities */
1048		{
1049		static char     xbuf[24], ybuf[24];
1050		static char     *ccom[4] = {mg_ename[MG_E_CXY], xbuf, ybuf};
981	–	int     rv;
1051
1052		sprintf(xbuf, "%.4f", c_ccolor->cx);
1053		sprintf(ybuf, "%.4f", c_ccolor->cy);
1054	<	if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
986	<	return(rv);
987	<	return(MG_OK);
1054	>	return(mg_handle(MG_E_CXY, 3, ccom));
1055		}
1056
1057

Diff Legend

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