region.h		region.h
	skipping to change at line 104		skipping to change at line 104
	double fillfactor; /* Fill factor (0.0->1.0) */		double fillfactor; /* Fill factor (0.0->1.0) */
	int regionfs; /* Include FrameSet in dump? */		int regionfs; /* Include FrameSet in dump? */
	int negated; /* Has the Region been negated? */		int negated; /* Has the Region been negated? */
	int closed; /* Is the boundary part of the Region? */		int closed; /* Is the boundary part of the Region? */
	int meshsize; /* No. of points on boundary mesh */		int meshsize; /* No. of points on boundary mesh */
	struct AstRegion *defunc; /* Default uncertainty Region */		struct AstRegion *defunc; /* Default uncertainty Region */
	AstPointSet *basemesh; /* Base frame mesh covering the boundary */		AstPointSet *basemesh; /* Base frame mesh covering the boundary */
	AstPointSet *basegrid; /* Base frame grid covering the boundary */		AstPointSet *basegrid; /* Base frame grid covering the boundary */
	int adaptive; /* Does the Region adapt to coord sys changes ? */		int adaptive; /* Does the Region adapt to coord sys changes ? */
	int nomap; /* Ignore the Region's FrameSet? */		int nomap; /* Ignore the Region's FrameSet? */
			struct AstRegion *negation;/* Negated copy of "this" */
	} AstRegion;		} AstRegion;
	/* Virtual function table. */		/* Virtual function table. */
	/* ----------------------- */		/* ----------------------- */
	/* This table contains all information that is the same for all objects in the		/* This table contains all information that is the same for all objects in the
	class (e.g. pointers to its virtual functions). */		class (e.g. pointers to its virtual functions). */
	#if defined(astCLASS) /* Protected */		#if defined(astCLASS) /* Protected */
	typedef struct AstRegionVtab {		typedef struct AstRegionVtab {
	/* Properties (e.g. methods) inherited from the parent class. */		/* Properties (e.g. methods) inherited from the parent class. */
	skipping to change at line 151		skipping to change at line 152
	int (* TestUnc)( AstRegion *, int * );		int (* TestUnc)( AstRegion *, int * );
	int (* RegDummyFS)( AstRegion *, int * );		int (* RegDummyFS)( AstRegion *, int * );
	int (* RegPins)( AstRegion *, AstPointSet *, AstRegion *, int **, int * );		int (* RegPins)( AstRegion *, AstPointSet *, AstRegion *, int **, int * );
	AstMapping *(* RegMapping)( AstRegion *, int * );		AstMapping *(* RegMapping)( AstRegion *, int * );
	AstPointSet *(* RegMesh)( AstRegion *, int * );		AstPointSet *(* RegMesh)( AstRegion *, int * );
	AstPointSet *(* RegGrid)( AstRegion *, int * );		AstPointSet *(* RegGrid)( AstRegion *, int * );
	AstPointSet *(* RegBaseMesh)( AstRegion *, int * );		AstPointSet *(* RegBaseMesh)( AstRegion *, int * );
	AstPointSet *(* RegBaseGrid)( AstRegion *, int * );		AstPointSet *(* RegBaseGrid)( AstRegion *, int * );
	AstPointSet *(* BndBaseMesh)( AstRegion *, double *, double *, int * );		AstPointSet *(* BndBaseMesh)( AstRegion *, double *, double *, int * );
	AstPointSet *(* BndMesh)( AstRegion *, double *, double *, int * );		AstPointSet *(* BndMesh)( AstRegion *, double *, double *, int * );
			AstRegion *(* GetNegation)( AstRegion *, int * );
	AstRegion *(* GetUncFrm)( AstRegion *, int, int * );		AstRegion *(* GetUncFrm)( AstRegion *, int, int * );
	AstRegion *(* GetUnc)( AstRegion *, int, int * );		AstRegion *(* GetUnc)( AstRegion *, int, int * );
	AstRegion *(* GetDefUnc)( AstRegion *, int * );		AstRegion *(* GetDefUnc)( AstRegion *, int * );
	AstRegion *(* RegBasePick)( AstRegion *this, int, const int *, int * );		AstRegion *(* RegBasePick)( AstRegion *this, int, const int *, int * );
	void (* ResetCache)( AstRegion *, int * );		void (* ResetCache)( AstRegion *, int * );
	int (* RegTrace)( AstRegion *, int, double *, double **, int * );		int (* RegTrace)( AstRegion *, int, double *, double **, int * );
	void (* SetUnc)( AstRegion *, AstRegion *, int * );		void (* SetUnc)( AstRegion *, AstRegion *, int * );
	void (* SetRegFS)( AstRegion *, AstFrame *, int * );		void (* SetRegFS)( AstRegion *, AstFrame *, int * );
	double *(* RegCentre)( AstRegion *, double *, double **, int, int, int * );		double *(* RegCentre)( AstRegion *, double *, double **, int, int, int * );
	skipping to change at line 267		skipping to change at line 269
	int astMaskD_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], double[], double, int * );		int astMaskD_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], double[], double, int * );
	int astMaskF_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], float[], float, int * );		int astMaskF_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], float[], float, int * );
	int astMaskI_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], int[], int, int * );		int astMaskI_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], int[], int, int * );
	int astMaskL_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], long int[], long int, int * );		int astMaskL_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], long int[], long int, int * );
	int astMaskS_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], short int[], short int, int * );		int astMaskS_( AstRegion *, AstMapping *, int, int, const int[], const int[ ], short int[], short int, int * );
	int astMaskUB_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned char[], unsigned char, int * );		int astMaskUB_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned char[], unsigned char, int * );
	int astMaskUI_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned int[], unsigned int, int * );		int astMaskUI_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned int[], unsigned int, int * );
	int astMaskUL_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned long int[], unsigned long int, int * );		int astMaskUL_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned long int[], unsigned long int, int * );
	int astMaskUS_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned short int[], unsigned short int, int * );		int astMaskUS_( AstRegion *, AstMapping *, int, int, const int[], const int [], unsigned short int[], unsigned short int, int * );
	void astSetUnc_( AstRegion *, AstRegion *, int * );		void astSetUnc_( AstRegion *, AstRegion *, int * );
			AstRegion *astGetNegation_( AstRegion *, int * );
	AstRegion *astGetUnc_( AstRegion *, int, int * );		AstRegion *astGetUnc_( AstRegion *, int, int * );
	void astGetRegionBounds_( AstRegion *, double *, double *, int * );		void astGetRegionBounds_( AstRegion *, double *, double *, int * );
	void astShowMesh_( AstRegion *, int, const char *, int * );		void astShowMesh_( AstRegion *, int, const char *, int * );
	void astGetRegionMesh_( AstRegion *, int, int, int, int *, double *, int * );		void astGetRegionMesh_( AstRegion *, int, int, int, int *, double *, int * );
	void astGetRegionPoints_( AstRegion *, int, int, int *, double *, int * );		void astGetRegionPoints_( AstRegion *, int, int, int *, double *, int * );
	#if defined(astCLASS) /* Protected */		#if defined(astCLASS) /* Protected */
	void astGetRegionBounds2_( AstRegion *, double *, double *, int * );		void astGetRegionBounds2_( AstRegion *, double *, double *, int * );
	AstRegion *astMapRegion_( AstRegion *, AstMapping *, AstFrame *, int * );		AstRegion *astMapRegion_( AstRegion *, AstMapping *, AstFrame *, int * );
	AstFrame *astRegFrame_( AstRegion *, int * );		AstFrame *astRegFrame_( AstRegion *, int * );
	skipping to change at line 424		skipping to change at line 427
	#define astShowMesh(this,format,ttl) astINVOKE(V,astShowMesh_(astCheckRegio n(this),format,ttl,STATUS_PTR))		#define astShowMesh(this,format,ttl) astINVOKE(V,astShowMesh_(astCheckRegio n(this),format,ttl,STATUS_PTR))
	#define astGetRegionMesh(this,surface,maxpoint,maxcoord,npoint,points) \		#define astGetRegionMesh(this,surface,maxpoint,maxcoord,npoint,points) \
	astINVOKE(V,astGetRegionMesh_(astCheckRegion(this),surface,maxpoint,maxcoor d,npoint,points,STATUS_PTR))		astINVOKE(V,astGetRegionMesh_(astCheckRegion(this),surface,maxpoint,maxcoor d,npoint,points,STATUS_PTR))
	#define astGetRegionPoints(this,maxpoint,maxcoord,npoint,points) \		#define astGetRegionPoints(this,maxpoint,maxcoord,npoint,points) \
	astINVOKE(V,astGetRegionPoints_(astCheckRegion(this),maxpoint,maxcoord,npoi nt,points,STATUS_PTR))		astINVOKE(V,astGetRegionPoints_(astCheckRegion(this),maxpoint,maxcoord,npoi nt,points,STATUS_PTR))
	/* Interfaces to protected member functions. */		/* Interfaces to protected member functions. */
	/* ----------------------------------------- */		/* ----------------------------------------- */
	#if defined(astCLASS) /* Protected */		#if defined(astCLASS) /* Protected */
			#define astGetNegation(this) astINVOKE(O,astGetNegation_(astCheckRegion(thi s),STATUS_PTR))
	#define astGetRegionBounds2(this,lbnd,ubnd) astINVOKE(V,astGetRegionBounds2 _(astCheckRegion(this),lbnd,ubnd,STATUS_PTR))		#define astGetRegionBounds2(this,lbnd,ubnd) astINVOKE(V,astGetRegionBounds2 _(astCheckRegion(this),lbnd,ubnd,STATUS_PTR))
	#define astClearUnc(this) astINVOKE(V,astClearUnc_(astCheckRegion(this),STA TUS_PTR))		#define astClearUnc(this) astINVOKE(V,astClearUnc_(astCheckRegion(this),STA TUS_PTR))
	#define astGetBounded(this) astINVOKE(V,astGetBounded_(astCheckRegion(this) ,STATUS_PTR))		#define astGetBounded(this) astINVOKE(V,astGetBounded_(astCheckRegion(this) ,STATUS_PTR))
	#define astGetUncFrm(this,ifrm) astINVOKE(O,astGetUncFrm_(astCheckRegion(th is),ifrm,STATUS_PTR))		#define astGetUncFrm(this,ifrm) astINVOKE(O,astGetUncFrm_(astCheckRegion(th is),ifrm,STATUS_PTR))
	#define astGetDefUnc(this) astINVOKE(O,astGetDefUnc_(astCheckRegion(this),S TATUS_PTR))		#define astGetDefUnc(this) astINVOKE(O,astGetDefUnc_(astCheckRegion(this),S TATUS_PTR))
	#define astMapRegion(this,map,frame) astINVOKE(O,astMapRegion_(astCheckRegi on(this),astCheckMapping(map),astCheckFrame(frame),STATUS_PTR))		#define astMapRegion(this,map,frame) astINVOKE(O,astMapRegion_(astCheckRegi on(this),astCheckMapping(map),astCheckFrame(frame),STATUS_PTR))
	#define astOverlapX(that,this) astINVOKE(V,astOverlapX_(astCheckRegion(that ),astCheckRegion(this),STATUS_PTR))		#define astOverlapX(that,this) astINVOKE(V,astOverlapX_(astCheckRegion(that ),astCheckRegion(this),STATUS_PTR))
	#define astRegBaseBox(this,lbnd,ubnd) astINVOKE(V,astRegBaseBox_(astCheckRe gion(this),lbnd,ubnd,STATUS_PTR))		#define astRegBaseBox(this,lbnd,ubnd) astINVOKE(V,astRegBaseBox_(astCheckRe gion(this),lbnd,ubnd,STATUS_PTR))
	#define astRegBaseBox2(this,lbnd,ubnd) astINVOKE(V,astRegBaseBox2_(astCheck Region(this),lbnd,ubnd,STATUS_PTR))		#define astRegBaseBox2(this,lbnd,ubnd) astINVOKE(V,astRegBaseBox2_(astCheck Region(this),lbnd,ubnd,STATUS_PTR))
	#define astRegSetAttrib(this,setting,bset) astINVOKE(V,astRegSetAttrib_(ast CheckRegion(this),setting,bset,STATUS_PTR))		#define astRegSetAttrib(this,setting,bset) astINVOKE(V,astRegSetAttrib_(ast CheckRegion(this),setting,bset,STATUS_PTR))
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/