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.9 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.12 by schorsch, Mon Jun 30 14:59:12 2003 UTC

#	Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15		#include  <X/cursors/bcross_mask.cursor>
16
17		#include  <sys/types.h>
18	<
18	>	#include  <string.h>
19		#include  <ctype.h>
20	–
20		#include  <time.h>
21
22		#include  "color.h"
24	–
23		#include  "resolu.h"
26	–
24		#include  "xraster.h"
28	–
25		#include  "view.h"
30	–
26		#include  "pic.h"
32	–
27		#include  "random.h"
28
29		#define  controlshift(e)        (((XButtonEvent *)(e))->detail & (ShiftMask|ControlMask))
#	Line 597 | Line 591 | colormap       cmap;
591		xr->cdefs[xr->ncolors].pixel = *p;
592		xr->pmap[*p] = xr->ncolors++;
593		}
594	<	xr->cdefs = (Color *)realloc((char *)xr->cdefs, xr->ncolors*sizeof(Color));
594	>	xr->cdefs = (Color *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(Color));
595		if (xr->cdefs == NULL)
596		return(0);
597		return(1);
#	Line 674 | Line 668 | picwriteline(y, l)             /* add 8-bit scanline to image */
668		int  y;
669		pixel  *l;
670		{
671	<	bcopy((char *)l, (char *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
671	>	memcpy((void *)ourras->data.bz+BZPixmapSize(xmax,y), (void *)l, BZPixmapSize(xmax,1));
672		}
673
674

Diff Legend

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