AST_PAR   AST_PAR 
skipping to change at line 426 skipping to change at line 426
INTEGER AST__STG INTEGER AST__STG
PARAMETER ( AST__STG = 4 ) PARAMETER ( AST__STG = 4 )
INTEGER AST__SZP INTEGER AST__SZP
PARAMETER ( AST__SZP = 2 ) PARAMETER ( AST__SZP = 2 )
INTEGER AST__TAN INTEGER AST__TAN
PARAMETER ( AST__TAN = 3 ) PARAMETER ( AST__TAN = 3 )
INTEGER AST__TPN INTEGER AST__TPN
PARAMETER ( AST__TPN = 29 ) PARAMETER ( AST__TPN = 29 )
INTEGER AST__TSC INTEGER AST__TSC
PARAMETER ( AST__TSC = 24 ) PARAMETER ( AST__TSC = 24 )
INTEGER AST__XPH
PARAMETER ( AST__XPH = 31 )
INTEGER AST__ZEA INTEGER AST__ZEA
PARAMETER ( AST__ZEA = 8 ) PARAMETER ( AST__ZEA = 8 )
INTEGER AST__ZPN INTEGER AST__ZPN
PARAMETER ( AST__ZPN = 7 ) PARAMETER ( AST__ZPN = 7 )
INTEGER AST__WCSBAD INTEGER AST__WCSBAD
PARAMETER ( AST__WCSBAD = 30 ) PARAMETER ( AST__WCSBAD = 32 )
INTEGER AST_WCSMAP INTEGER AST_WCSMAP
LOGICAL AST_ISAWCSMAP LOGICAL AST_ISAWCSMAP
* ShiftMap class. * ShiftMap class.
INTEGER AST_SHIFTMAP INTEGER AST_SHIFTMAP
LOGICAL AST_ISASHIFTMAP LOGICAL AST_ISASHIFTMAP
* WinMap class. * WinMap class.
INTEGER AST_WINMAP INTEGER AST_WINMAP
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 ast.h   ast.h 
skipping to change at line 48 skipping to change at line 48
* You should have received a copy of the GNU Lesser General * You should have received a copy of the GNU Lesser General
* License along with this program. If not, see * License along with this program. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
* Authors: * Authors:
* DSB: D.S. Berry (STARLINK) * DSB: D.S. Berry (STARLINK)
* RFWS: R.F. Warren-Smith (STARLINK) * RFWS: R.F. Warren-Smith (STARLINK)
* {enter_new_authors_here} * {enter_new_authors_here}
* History: * History:
* 13-MAY-2014 (makeh): * 21-OCT-2014 (makeh):
* Original version, generated automatically from the internal header * Original version, generated automatically from the internal header
* files by the "makeh" script. * files by the "makeh" script.
* {enter_changes_here} * {enter_changes_here}
*- *-
*/ */
/* Define a dummy __attribute__ macro for use on non-GNU compilers. */ /* Define a dummy __attribute__ macro for use on non-GNU compilers. */
#ifndef __GNUC__ #ifndef __GNUC__
# define __attribute__(x) /*NOTHING*/ # define __attribute__(x) /*NOTHING*/
#endif #endif
skipping to change at line 416 skipping to change at line 416
int astTSCrev(const double, const double, struct AstPrjPrm *, double *, double *); int astTSCrev(const double, const double, struct AstPrjPrm *, double *, double *);
int astCSCset(struct AstPrjPrm *); int astCSCset(struct AstPrjPrm *);
int astCSCfwd(const double, const double, struct AstPrjPrm *, double *, double *); int astCSCfwd(const double, const double, struct AstPrjPrm *, double *, double *);
int astCSCrev(const double, const double, struct AstPrjPrm *, double *, double *); int astCSCrev(const double, const double, struct AstPrjPrm *, double *, double *);
int astQSCset(struct AstPrjPrm *); int astQSCset(struct AstPrjPrm *);
int astQSCfwd(const double, const double, struct AstPrjPrm *, double *, double *); int astQSCfwd(const double, const double, struct AstPrjPrm *, double *, double *);
int astQSCrev(const double, const double, struct AstPrjPrm *, double *, double *); int astQSCrev(const double, const double, struct AstPrjPrm *, double *, double *);
int astHPXset(struct AstPrjPrm *); int astHPXset(struct AstPrjPrm *);
int astHPXfwd(const double, const double, struct AstPrjPrm *, double *, double *); int astHPXfwd(const double, const double, struct AstPrjPrm *, double *, double *);
int astHPXrev(const double, const double, struct AstPrjPrm *, double *, double *); int astHPXrev(const double, const double, struct AstPrjPrm *, double *, double *);
int astXPHset(struct AstPrjPrm *);
int astXPHfwd(const double, const double, struct AstPrjPrm *, double *,
double *);
int astXPHrev(const double, const double, struct AstPrjPrm *, double *,
double *);
int astTPNset(struct AstPrjPrm *); int astTPNset(struct AstPrjPrm *);
int astTPNfwd(const double, const double, struct AstPrjPrm *, double *, double *); int astTPNfwd(const double, const double, struct AstPrjPrm *, double *, double *);
int astTPNrev(const double, const double, struct AstPrjPrm *, double *, double *); int astTPNrev(const double, const double, struct AstPrjPrm *, double *, double *);
extern const char *astPRJset_errmsg[]; extern const char *astPRJset_errmsg[];
extern const char *astPRJfwd_errmsg[]; extern const char *astPRJfwd_errmsg[];
extern const char *astPRJrev_errmsg[]; extern const char *astPRJrev_errmsg[];
/* memory. */ /* memory. */
/* ======= */ /* ======= */
skipping to change at line 476 skipping to change at line 479
void *astFreeDouble_( void *, int * ); void *astFreeDouble_( void *, int * );
void *astGrow_( void *, int, size_t, int * ); void *astGrow_( void *, int, size_t, int * );
void *astCalloc_( size_t, size_t, int * ); void *astCalloc_( size_t, size_t, int * );
void *astMalloc_( size_t, int, int * ); void *astMalloc_( size_t, int, int * );
void *astRealloc_( void *, size_t, int * ); void *astRealloc_( void *, size_t, int * );
void *astStore_( void *, const void *, size_t, int * ); void *astStore_( void *, const void *, size_t, int * );
size_t astChrLen_( const char *, int * ); size_t astChrLen_( const char *, int * );
double astChr2Double_( const char *, int * ); double astChr2Double_( const char *, int * );
void astRemoveLeadingBlanks_( char *, int * ); void astRemoveLeadingBlanks_( char *, int * );
char *astAppendString_( char *, int *, const char *, int * ); char *astAppendString_( char *, int *, const char *, int * );
char *astAppendStringf_( char *, int *, const char *, ... )__attribute__((f ormat(printf,3,4)));
char *astChrSub_( const char *, const char *, const char *[], int, int * ); char *astChrSub_( const char *, const char *, const char *[], int, int * );
#define astCalloc(nmemb,size) astERROR_INVOKE(astCalloc_(nmemb,size,STATUS_ PTR)) #define astCalloc(nmemb,size) astERROR_INVOKE(astCalloc_(nmemb,size,STATUS_ PTR))
#define astChrMatch(str1,str2) astERROR_INVOKE(astChrMatch_(str1,str2,STATU S_PTR)) #define astChrMatch(str1,str2) astERROR_INVOKE(astChrMatch_(str1,str2,STATU S_PTR))
#define astChrMatchN(str1,str2,n) astERROR_INVOKE(astChrMatchN_(str1,str2,n ,STATUS_PTR)) #define astChrMatchN(str1,str2,n) astERROR_INVOKE(astChrMatchN_(str1,str2,n ,STATUS_PTR))
#define astFree(ptr) astERROR_INVOKE(astFree_(ptr,STATUS_PTR)) #define astFree(ptr) astERROR_INVOKE(astFree_(ptr,STATUS_PTR))
#define astFreeDouble(ptr) astERROR_INVOKE(astFreeDouble_(ptr,STATUS_PTR)) #define astFreeDouble(ptr) astERROR_INVOKE(astFreeDouble_(ptr,STATUS_PTR))
#define astGrow(ptr,n,size) astERROR_INVOKE(astGrow_(ptr,n,size,STATUS_PTR) ) #define astGrow(ptr,n,size) astERROR_INVOKE(astGrow_(ptr,n,size,STATUS_PTR) )
#define astMalloc(size) astERROR_INVOKE(astMalloc_(size,0,STATUS_PTR)) #define astMalloc(size) astERROR_INVOKE(astMalloc_(size,0,STATUS_PTR))
#define astMemCaching(flag) astERROR_INVOKE(astMemCaching_(flag,STATUS_PTR) ) #define astMemCaching(flag) astERROR_INVOKE(astMemCaching_(flag,STATUS_PTR) )
#define astRealloc(ptr,size) astERROR_INVOKE(astRealloc_(ptr,size,STATUS_PT R)) #define astRealloc(ptr,size) astERROR_INVOKE(astRealloc_(ptr,size,STATUS_PT R))
#define astSizeOf(ptr) astERROR_INVOKE(astSizeOf_(ptr,STATUS_PTR)) #define astSizeOf(ptr) astERROR_INVOKE(astSizeOf_(ptr,STATUS_PTR))
#define astIsDynamic(ptr) astERROR_INVOKE(astIsDynamic_(ptr,STATUS_PTR)) #define astIsDynamic(ptr) astERROR_INVOKE(astIsDynamic_(ptr,STATUS_PTR))
#define astTSizeOf(ptr) astERROR_INVOKE(astTSizeOf_(ptr,STATUS_PTR)) #define astTSizeOf(ptr) astERROR_INVOKE(astTSizeOf_(ptr,STATUS_PTR))
#define astStore(ptr,data,size) astERROR_INVOKE(astStore_(ptr,data,size,STA TUS_PTR)) #define astStore(ptr,data,size) astERROR_INVOKE(astStore_(ptr,data,size,STA TUS_PTR))
#define astAppendString(ptr,len,text) astERROR_INVOKE(astAppendString_(ptr, #define astAppendString(str1,nc,str2) astERROR_INVOKE(astAppendString_(str1
len,text,STATUS_PTR)) ,nc,str2,STATUS_PTR))
#define astAppendStringf astAppendStringf_
#define astString(chars,nchars) astERROR_INVOKE(astString_(chars,nchars,STA TUS_PTR)) #define astString(chars,nchars) astERROR_INVOKE(astString_(chars,nchars,STA TUS_PTR))
#define astStringArray(chars,nel,len) astERROR_INVOKE(astStringArray_(chars ,nel,len,STATUS_PTR)) #define astStringArray(chars,nel,len) astERROR_INVOKE(astStringArray_(chars ,nel,len,STATUS_PTR))
#define astStringCase(string,toupper) astERROR_INVOKE(astStringCase_(string ,toupper,STATUS_PTR)) #define astStringCase(string,toupper) astERROR_INVOKE(astStringCase_(string ,toupper,STATUS_PTR))
#define astChrLen(string) astERROR_INVOKE(astChrLen_(string,STATUS_PTR)) #define astChrLen(string) astERROR_INVOKE(astChrLen_(string,STATUS_PTR))
#define astChr2Double(string) astERROR_INVOKE(astChr2Double_(string,STATUS_ PTR)) #define astChr2Double(string) astERROR_INVOKE(astChr2Double_(string,STATUS_ PTR))
#define astRemoveLeadingBlanks(string) astERROR_INVOKE(astRemoveLeadingBlan ks_(string,STATUS_PTR)) #define astRemoveLeadingBlanks(string) astERROR_INVOKE(astRemoveLeadingBlan ks_(string,STATUS_PTR))
#define astChrSub(test,template,subs,nsub) astERROR_INVOKE(astChrSub_(test, template,subs,nsub,STATUS_PTR)) #define astChrSub(test,template,subs,nsub) astERROR_INVOKE(astChrSub_(test, template,subs,nsub,STATUS_PTR))
#define astChrCase(in,out,upper,blen) astERROR_INVOKE(astChrCase_(in,out,up per,blen,STATUS_PTR)) #define astChrCase(in,out,upper,blen) astERROR_INVOKE(astChrCase_(in,out,up per,blen,STATUS_PTR))
#define astSscanf astERROR_INVOKE(sscanf) #define astSscanf astERROR_INVOKE(sscanf)
skipping to change at line 528 skipping to change at line 533
/* ====== */ /* ====== */
/* globals. */ /* globals. */
/* ======== */ /* ======== */
#define astDECLARE_GLOBALS #define astDECLARE_GLOBALS
#define astGET_GLOBALS(This) #define astGET_GLOBALS(This)
#define astINIT_GLOBALS #define astINIT_GLOBALS
/* unit. */ /* unit. */
/* ===== */ /* ===== */
#define AST__VMAJOR 8 #define AST__VMAJOR 8
#define AST__VMINOR 0 #define AST__VMINOR 0
#define AST__RELEASE 0 #define AST__RELEASE 2
#define AST_MAJOR_VERS 8 #define AST_MAJOR_VERS 8
#define AST_MINOR_VERS 0 #define AST_MINOR_VERS 0
#define AST_RELEASE 0 #define AST_RELEASE 2
#include <stdarg.h> #include <stdarg.h>
#include <float.h> #include <float.h>
#include <stdio.h> #include <stdio.h>
#define STATUS_PTR astGetStatusPtr #define STATUS_PTR astGetStatusPtr
#define AST__THREADSAFE 1 #define AST__THREADSAFE 1
#define astINVOKE(rettype,function) astERROR_INVOKE(astRet##rettype##_(func tion)) #define astINVOKE(rettype,function) astERROR_INVOKE(astRet##rettype##_(func tion))
#define astRetF_(x) (x) #define astRetF_(x) (x)
#define astRetV_(x) (x) #define astRetV_(x) (x)
skipping to change at line 850 skipping to change at line 855
PROTO_GENERIC_ALL(UL,unsigned long int) PROTO_GENERIC_ALL(UL,unsigned long int)
PROTO_GENERIC_ALL(US,unsigned short int) PROTO_GENERIC_ALL(US,unsigned short int)
PROTO_GENERIC_ALL(LD,long double) PROTO_GENERIC_ALL(LD,long double)
#define PROTO_GENERIC_DFI(X,Xtype) void astRebin##X##_( AstMapping *, doubl e, int, const int [], const int [], const Xtype [], const Xtype [], int, co nst double [], int, double, int, Xtype, int, const int [], const int [], co nst int [], const int [], Xtype [], Xtype [], int * ); void astRebinSeq##X# #_( AstMapping *, double, int, const int [], const int [], const Xtype [], const Xtype [], int, const double [], int, double, int, Xtype, int, const i nt [], const int [], const int [], const int [], Xtype [], Xtype [], double [], int64_t *, int * ); #define PROTO_GENERIC_DFI(X,Xtype) void astRebin##X##_( AstMapping *, doubl e, int, const int [], const int [], const Xtype [], const Xtype [], int, co nst double [], int, double, int, Xtype, int, const int [], const int [], co nst int [], const int [], Xtype [], Xtype [], int * ); void astRebinSeq##X# #_( AstMapping *, double, int, const int [], const int [], const Xtype [], const Xtype [], int, const double [], int, double, int, Xtype, int, const i nt [], const int [], const int [], const int [], Xtype [], Xtype [], double [], int64_t *, int * );
PROTO_GENERIC_DFI(D,double) PROTO_GENERIC_DFI(D,double)
PROTO_GENERIC_DFI(F,float) PROTO_GENERIC_DFI(F,float)
PROTO_GENERIC_DFI(I,int) PROTO_GENERIC_DFI(I,int)
PROTO_GENERIC_DFI(B,char)
PROTO_GENERIC_DFI(UB,unsigned char)
PROTO_GENERIC_DFI(LD,long double) PROTO_GENERIC_DFI(LD,long double)
AstMapping *astRemoveRegions_( AstMapping *, int * ); AstMapping *astRemoveRegions_( AstMapping *, int * );
AstMapping *astSimplify_( AstMapping *, int * ); AstMapping *astSimplify_( AstMapping *, int * );
void astInvert_( AstMapping *, int * ); void astInvert_( AstMapping *, int * );
int astLinearApprox_( AstMapping *, const double *, const double *, double, double *, int * ); int astLinearApprox_( AstMapping *, const double *, const double *, double, double *, int * );
int astQuadApprox_( AstMapping *, const double[2], const double[2], int, in t, double *, double *, int * ); int astQuadApprox_( AstMapping *, const double[2], const double[2], int, in t, double *, double *, int * );
void astTran1_( AstMapping *, int, const double [], int, double [], int * ) ; void astTran1_( AstMapping *, int, const double [], int, double [], int * ) ;
void astTran2_( AstMapping *, int, const double [], const double [], int, d ouble [], double [], int * ); void astTran2_( AstMapping *, int, const double [], const double [], int, d ouble [], double [], int * );
skipping to change at line 880 skipping to change at line 887
#define astIsAMapping(this) astINVOKE_ISA(Mapping,this) #define astIsAMapping(this) astINVOKE_ISA(Mapping,this)
#define astResampleLD(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleLD_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleLD(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleLD_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astInvert(this) astINVOKE(V,astInvert_(astCheckMapping(this),STATUS _PTR)) #define astInvert(this) astINVOKE(V,astInvert_(astCheckMapping(this),STATUS _PTR))
#define astLinearApprox(this,lbnd,ubnd,tol,fit) astINVOKE(V,astLinearApprox _(astCheckMapping(this),lbnd,ubnd,tol,fit,STATUS_PTR)) #define astLinearApprox(this,lbnd,ubnd,tol,fit) astINVOKE(V,astLinearApprox _(astCheckMapping(this),lbnd,ubnd,tol,fit,STATUS_PTR))
#define astQuadApprox(this,lbnd,ubnd,nx,ny,fit,rms) astINVOKE(V,astQuadAppr ox_(astCheckMapping(this),lbnd,ubnd,nx,ny,fit,rms,STATUS_PTR)) #define astQuadApprox(this,lbnd,ubnd,nx,ny,fit,rms) astINVOKE(V,astQuadAppr ox_(astCheckMapping(this),lbnd,ubnd,nx,ny,fit,rms,STATUS_PTR))
#define astRebinD(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinD_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR)) #define astRebinD(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinD_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR))
#define astRebinF(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinF_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR)) #define astRebinF(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinF_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR))
#define astRebinI(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinI_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR)) #define astRebinI(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params ,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var) astINVOKE(V,astRebinI_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l bnd,ubnd,out,out_var,STATUS_PTR))
#define astRebinB(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,params
,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var)
astINVOKE(V,astRebinB_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in,i
n,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,l
bnd,ubnd,out,out_var,STATUS_PTR))
#define astRebinUB(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,param
s,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var)
astINVOKE(V,astRebinUB_(astCheckMapping(this),wlim,ndim_in,lbnd_in,ubnd_in
,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out
,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astRebinSeqD(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqD_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR)) #define astRebinSeqD(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqD_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR))
#define astRebinSeqF(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqF_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR)) #define astRebinSeqF(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqF_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR))
#define astRebinSeqI(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqI_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR)) #define astRebinSeqI(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va r,weights,nused) astINVOKE(V,astRebinSeqI_(astCheckMapping(this),wlim,ndim_ in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out ,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR))
#define astRebinSeqB(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,par
ams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_va
r,weights,nused) astINVOKE(V,astRebinSeqB_(astCheckMapping(this),wlim,ndim_
in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_out
,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR))
#define astRebinSeqUB(this,wlim,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,pa
rams,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out_v
ar,weights,nused) astINVOKE(V,astRebinSeqUB_(astCheckMapping(this),wlim,ndi
m_in,lbnd_in,ubnd_in,in,in_var,interp,params,flags,tol,maxpix,badval,ndim_o
ut,lbnd_out,ubnd_out,lbnd,ubnd,out,out_var,weights,nused,STATUS_PTR))
#define astResampleD(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleD_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleD(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleD_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleF(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleF_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleF(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleF_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleL(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleL_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleL(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleL_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleUL(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUL_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleUL(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUL_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleI(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleI_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleI(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleI_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleUI(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUI_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleUI(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUI_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleK(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleK_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleK(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleK_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleUK(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUK_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleUK(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUK_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleS(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleS_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleS(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp, params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,out _var) astINVOKE(V,astResampleS_(astCheckMapping(this),ndim_in,lbnd_in,ubnd_ in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ou t,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
#define astResampleUS(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUS_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR)) #define astResampleUS(this,ndim_in,lbnd_in,ubnd_in,in,in_var,interp,finterp ,params,flags,tol,maxpix,badval,ndim_out,lbnd_out,ubnd_out,lbnd,ubnd,out,ou t_var) astINVOKE(V,astResampleUS_(astCheckMapping(this),ndim_in,lbnd_in,ubn d_in,in,in_var,interp,finterp,params,flags,tol,maxpix,badval,ndim_out,lbnd_ out,ubnd_out,lbnd,ubnd,out,out_var,STATUS_PTR))
skipping to change at line 1482 skipping to change at line 1493
int encoding; int encoding;
int defb1950; int defb1950;
int tabok; int tabok;
int cdmatrix; int cdmatrix;
int polytan; int polytan;
int carlin; int carlin;
int iwc; int iwc;
int clean; int clean;
int fitsdigits; int fitsdigits;
char *fitsaxisorder;
char *warnings; char *warnings;
void *card; void *card;
void *head; void *head;
AstKeyMap *keyseq; AstKeyMap *keyseq;
AstKeyMap *keywords; AstKeyMap *keywords;
AstKeyMap *tables; AstKeyMap *tables;
const char *(* source)( void ); const char *(* source)( void );
const char *(* saved_source)( void ); const char *(* saved_source)( void );
char *(* source_wrap)( const char *(*)( void ), int * ); char *(* source_wrap)( const char *(*)( void ), int * );
skipping to change at line 2462 skipping to change at line 2474
#define AST__COO 21 #define AST__COO 21
#define AST__BON 22 #define AST__BON 22
#define AST__PCO 23 #define AST__PCO 23
#define AST__TSC 24 #define AST__TSC 24
#define AST__CSC 25 #define AST__CSC 25
#define AST__QSC 26 #define AST__QSC 26
#define AST__NCP 27 #define AST__NCP 27
#define AST__GLS 28 #define AST__GLS 28
#define AST__TPN 29 #define AST__TPN 29
#define AST__HPX 30 #define AST__HPX 30
#define AST__WCSBAD 31 #define AST__XPH 31
#define AST__WCSBAD 32
typedef struct AstWcsMap { typedef struct AstWcsMap {
AstMapping mapping; AstMapping mapping;
int type; int type;
int wcsaxis[2]; int wcsaxis[2];
double **p; double **p;
int *np; int *np;
struct AstPrjPrm params; struct AstPrjPrm params;
 End of changes. 11 change blocks. 
6 lines changed or deleted 37 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/