[ViewVC] Diff of: radiance/ray/src/hd/sm

Comparing ray/src/hd/sm_usets.c (file contents):
Revision 3.3 by greg, Wed Apr 23 00:52:34 2003 UTC vs.
Revision 3.5 by schorsch, Mon Jun 30 14:59:12 2003 UTC

#	Line 5 \| Line 5 \| static const char RCSid[] = "$Id$";
5		* Quadtree-specific set operations with unsorted sets.
6		*/
7
8	+	#include <string.h>
9	+
10		#include "standard.h"
11		#include "sm_flag.h"
12		#include "object.h"
#	Line 21 \| Line 23 \| static const char RCSid[] = "$Id$";
23		OBJECT *qtsettab= NULL; / quadtree leaf node table */
24		QUADTREE qtnumsets=0; /* number of used set indices */
25		static int qtfreesets = EMPTY; /* free set index list */
26	<	int4 *qtsetflag = NULL;
26	>	int32 *qtsetflag = NULL;
27		static int qtallocsets =0;
28
29		qtclearsetflags()
#	Line 30 \| Line 32 \| qtclearsetflags()
32		if(!qtsetflag)
33		return;
34
35	<	bzero((char *)qtsetflag,FLAG_BYTES(qtallocsets));
35	>	memset((char *)qtsetflag, '\0', FLAG_BYTES(qtallocsets));
36		}
37
38
#	Line 50 \| Line 52 \| *OBJECT oset;**
52		(unsigned)(osi+QTSETIBLK)sizeof(OBJECT ));
53		if (qtsettab == NULL)
54		goto memerr;
55	<	qtsetflag = (int4 )realloc((void )qtsetflag,
55	>	qtsetflag = (int32 )realloc((void )qtsetflag,
56		FLAG_BYTES(osi+ QTSETIBLK));
57		if (qtsetflag == NULL)
58		goto memerr;
59		if(qtallocsets)
60	<	bzero((char )((char )(qtsetflag)+FLAG_BYTES(qtallocsets)),
60	>	memset((char )((char )(qtsetflag)+FLAG_BYTES(qtallocsets)), '\0',
61		FLAG_BYTES(osi+QTSETIBLK)-FLAG_BYTES(qtallocsets));
62		else
63	<	bzero((char *)(qtsetflag),FLAG_BYTES(osi +QTSETIBLK));
63	>	memset((char *)(qtsetflag), '\0', FLAG_BYTES(osi +QTSETIBLK));
64
65		qtallocsets = osi + QTSETIBLK;
66		}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines