ViewVC Help

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

root/Development/ray/src/px/ximage.c

Comparing ray/src/px/ximage.c (file contents):
Revision 2.3 by greg, Mon Dec 23 23:20:06 1991 UTC vs.
Revision 2.13 by schorsch, Fri Jan 2 12:47:01 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1987 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  ximage.c - driver for X-windows
6		*
#	Line 18 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
15		#include  <X/cursors/bcross_mask.cursor>
16
17		#include  <sys/types.h>
18	<
18	>	#include  <string.h>
19		#include  <ctype.h>
20	+	#include  <time.h>
21
22		#include  "color.h"
25	–
23		#include  "resolu.h"
27	–
24		#include  "xraster.h"
29	–
25		#include  "view.h"
31	–
26		#include  "pic.h"
33	–
27		#include  "random.h"
28
29		#define  controlshift(e)        (((XButtonEvent *)(e))->detail & (ShiftMask|ControlMask))
#	Line 86 | Line 79 | char  *progname;
79
80		char  errmsg[128];
81
82	<	extern long  ftell();
82	>	static gethfunc headline;
83
91	–	extern char  *malloc(), *calloc();
84
93	–	extern double  pow(), log();
94	–
95	–
85		main(argc, argv)
86		int  argc;
87		char  *argv[];
88		{
89	<	int  headline();
89	>	extern char  *getenv();
90	>	char  *gv;
91		int  i;
92
93		progname = argv[0];
94	+	if ((gv = getenv("DISPLAY_GAMMA")) != NULL)
95	+	gamcor = atof(gv);
96
97		for (i = 1; i < argc; i++)
98		if (argv[i][0] == '-')
#	Line 167 | Line 159 | userr:
159		}
160
161
162	<	headline(s)             /* get relevant info from header */
163	<	char  *s;
162	>	static int
163	>	headline(               /* get relevant info from header */
164	>	char    *s,
165	>	void    *p
166	>	)
167		{
173	–	static char  *altname[] = {"rview","rpict",VIEWSTR,NULL};
174	–	register char  **an;
168		char  fmt[32];
169
170		if (isexpos(s))
#	Line 179 | Line 172 | char  *s;
172		else if (isformat(s)) {
173		formatval(fmt, s);
174		wrongformat = strcmp(fmt, COLRFMT);
175	<	} else
176	<	for (an = altname; *an != NULL; an++)
177	<	if (!strncmp(*an, s, strlen(*an))) {
185	<	if (sscanview(&ourview, s+strlen(*an)) > 0)
186	<	gotview++;
187	<	return;
188	<	}
175	>	} else if (isview(s) && sscanview(&ourview, s) > 0)
176	>	gotview++;
177	>	return(0);
178		}
179
180
#	Line 254 | Line 243 | char  *err;
243		}
244
245
246	+	void
247		eputs(s)
248		char    *s;
249		{
#	Line 261 | Line 251 | char   *s;
251		}
252
253
254	+	void
255		quit(code)
256		int  code;
257		{
#	Line 574 | Line 565 | getmono()                      /* get monochrome data */
565		cerr[x] = err + errp;
566		}
567		}
568	<	free((char *)inl);
569	<	free((char *)cerr);
568	>	free((void *)inl);
569	>	free((void *)cerr);
570		}
571
572
#	Line 603 | Line 594 | colormap       cmap;
594		xr->cdefs[xr->ncolors].pixel = *p;
595		xr->pmap[*p] = xr->ncolors++;
596		}
597	<	xr->cdefs = (Color *)realloc((char *)xr->cdefs, xr->ncolors*sizeof(Color));
597	>	xr->cdefs = (Color *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(Color));
598		if (xr->cdefs == NULL)
599		return(0);
600		return(1);
#	Line 647 | Line 638 | int  y;
638		if (fseek(fin, scanpos[y], 0) == -1)
639		quiterr("fseek error");
640		cury = y;
641	<	} else if (scanpos != NULL)
641	>	} else if (scanpos != NULL && scanpos[y] == -1)
642		scanpos[y] = ftell(fin);
643
644		if (freadcolrs(scanline, xmax, fin) < 0)
#	Line 680 | Line 671 | picwriteline(y, l)             /* add 8-bit scanline to image */
671		int  y;
672		pixel  *l;
673		{
674	<	bcopy((char *)l, (char *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
674	>	memcpy((void *)ourras->data.bz+BZPixmapSize(xmax,y), (void *)l, BZPixmapSize(xmax,1));
675		}
676
677

Diff Legend

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