AST_ERR   AST_ERR 
skipping to change at line 615 skipping to change at line 615
INTEGER AST__NOFIT INTEGER AST__NOFIT
PARAMETER ( AST__NOFIT = 233934354 ) PARAMETER ( AST__NOFIT = 233934354 )
* A transformation generated one or more NaN values * A transformation generated one or more NaN values
INTEGER AST__ISNAN INTEGER AST__ISNAN
PARAMETER ( AST__ISNAN = 233934362 ) PARAMETER ( AST__ISNAN = 233934362 )
* write error * write error
INTEGER AST__WRERR INTEGER AST__WRERR
PARAMETER ( AST__WRERR = 233934370 ) PARAMETER ( AST__WRERR = 233934370 )
* Bad variant Mapping name
INTEGER AST__BDVNM
PARAMETER ( AST__BDVNM = 233934378 )
* Attempt to add a variant Mapping to a mirror Frame
INTEGER AST__MIRRO
PARAMETER ( AST__MIRRO = 233934386 )
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 ast.h   ast.h 
skipping to change at line 48 skipping to change at line 48
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street,Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin Street,Fifth Floor, Boston, MA
* 02110-1301, USA * 02110-1301, USA
* 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:
* 16-APR-2013 (makeh): * 31-MAY-2013 (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 533 skipping to change at line 533
/* error. */ /* error. */
/* ====== */ /* ====== */
/* 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 7 #define AST__VMAJOR 7
#define AST__VMINOR 2 #define AST__VMINOR 3
#define AST__RELEASE 0 #define AST__RELEASE 1
#define AST_MAJOR_VERS 7 #define AST_MAJOR_VERS 7
#define AST_MINOR_VERS 2 #define AST_MINOR_VERS 3
#define AST_RELEASE 0 #define AST_RELEASE 1
#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 783 skipping to change at line 783
#define astPointSet astINVOKE(F,astPointSetId_) #define astPointSet astINVOKE(F,astPointSetId_)
#define astGetPoints(this) astINVOKE(V,astGetPoints_(astCheckPointSet(this) ,STATUS_PTR)) #define astGetPoints(this) astINVOKE(V,astGetPoints_(astCheckPointSet(this) ,STATUS_PTR))
#define astPermPoints(this,forward,perm) astINVOKE(V,astPermPoints_(astChec kPointSet(this),forward,perm,STATUS_PTR)) #define astPermPoints(this,forward,perm) astINVOKE(V,astPermPoints_(astChec kPointSet(this),forward,perm,STATUS_PTR))
#define astSetPoints(this,ptr) astINVOKE(V,astSetPoints_(astCheckPointSet(t his),ptr,STATUS_PTR)) #define astSetPoints(this,ptr) astINVOKE(V,astSetPoints_(astCheckPointSet(t his),ptr,STATUS_PTR))
#define astSetNpoint(this,np) astINVOKE(V,astSetNpoint_(astCheckPointSet(th is),np,STATUS_PTR)) #define astSetNpoint(this,np) astINVOKE(V,astSetNpoint_(astCheckPointSet(th is),np,STATUS_PTR))
#define astSetSubPoints(point1,point,coord,point2) astINVOKE(V,astSetSubPoi nts_(astCheckPointSet(point1),point,coord,astCheckPointSet(point2),STATUS_P TR)) #define astSetSubPoints(point1,point,coord,point2) astINVOKE(V,astSetSubPoi nts_(astCheckPointSet(point1),point,coord,astCheckPointSet(point2),STATUS_P TR))
#define astAppendPoints(this,that) astINVOKE(O,astAppendPoints_(astCheckPoi ntSet(this),astCheckPointSet(that),STATUS_PTR)) #define astAppendPoints(this,that) astINVOKE(O,astAppendPoints_(astCheckPoi ntSet(this),astCheckPointSet(that),STATUS_PTR))
#define astBndPoints(this,lbnd,ubnd) astINVOKE(V,astBndPoints_(astCheckPoin tSet(this),lbnd,ubnd,STATUS_PTR)) #define astBndPoints(this,lbnd,ubnd) astINVOKE(V,astBndPoints_(astCheckPoin tSet(this),lbnd,ubnd,STATUS_PTR))
#define astReplaceNaN(this) astINVOKE(V,astReplaceNaN_(astCheckPointSet(thi s),STATUS_PTR)) #define astReplaceNaN(this) astINVOKE(V,astReplaceNaN_(astCheckPointSet(thi s),STATUS_PTR))
#include <stdint.h>
#define STATUS_PTR astGetStatusPtr #define STATUS_PTR astGetStatusPtr
#define AST__MAPPING_GETATTRIB_BUFF_LEN 50 #define AST__MAPPING_GETATTRIB_BUFF_LEN 50
#define AST__MAPPING_RATEFUN_MAX_CACHE 5 #define AST__MAPPING_RATEFUN_MAX_CACHE 5
#define AST__URESAMP1 (1) #define AST__URESAMP1 (1)
#define AST__URESAMP2 (2) #define AST__URESAMP2 (2)
#define AST__URESAMP3 (4) #define AST__URESAMP3 (4)
#define AST__URESAMP4 (8) #define AST__URESAMP4 (8)
#define AST__USEVAR (16) #define AST__USEVAR (16)
skipping to change at line 817 skipping to change at line 819
#define AST__LINEAR (5) #define AST__LINEAR (5)
#define AST__SINC (6) #define AST__SINC (6)
#define AST__SINCSINC (7) #define AST__SINCSINC (7)
#define AST__SINCCOS (8) #define AST__SINCCOS (8)
#define AST__SINCGAUSS (9) #define AST__SINCGAUSS (9)
#define AST__BLOCKAVE (10) #define AST__BLOCKAVE (10)
#define AST__GAUSS (11) #define AST__GAUSS (11)
#define AST__SOMB (12) #define AST__SOMB (12)
#define AST__SOMBCOS (13) #define AST__SOMBCOS (13)
#include <stdint.h>
typedef int64_t INT_BIG; typedef int64_t INT_BIG;
typedef uint64_t UINT_BIG; typedef uint64_t UINT_BIG;
typedef struct AstMapping { typedef struct AstMapping {
AstObject object; AstObject object;
char invert; char invert;
char issimple; char issimple;
int nin; int nin;
int nout; int nout;
skipping to change at line 850 skipping to change at line 851
PROTO_GENERIC_ALL(L,long int) PROTO_GENERIC_ALL(L,long int)
PROTO_GENERIC_ALL(S,short int) PROTO_GENERIC_ALL(S,short int)
PROTO_GENERIC_ALL(UB,unsigned char) PROTO_GENERIC_ALL(UB,unsigned char)
PROTO_GENERIC_ALL(UI,unsigned int) PROTO_GENERIC_ALL(UI,unsigned int)
PROTO_GENERIC_ALL(UK,UINT_BIG) PROTO_GENERIC_ALL(UK,UINT_BIG)
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 [], int *, 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(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 * );
skipping to change at line 1222 skipping to change at line 1223
enum { AST__NOTAB = 233934338 }; enum { AST__NOTAB = 233934338 };
enum { AST__LEVMAR = 233934346 }; enum { AST__LEVMAR = 233934346 };
enum { AST__NOFIT = 233934354 }; enum { AST__NOFIT = 233934354 };
enum { AST__ISNAN = 233934362 }; enum { AST__ISNAN = 233934362 };
enum { AST__WRERR = 233934370 }; enum { AST__WRERR = 233934370 };
enum { AST__BDVNM = 233934378 };
enum { AST__MIRRO = 233934386 };
/* version. */ /* version. */
/* ======== */ /* ======== */
/* object. */ /* object. */
/* ======= */ /* ======= */
/* keymap. */ /* keymap. */
/* ======= */ /* ======= */
#define AST__BADTYPE 0 #define AST__BADTYPE 0
#define AST__INTTYPE 1 #define AST__INTTYPE 1
#define AST__DOUBLETYPE 2 #define AST__DOUBLETYPE 2
#define AST__STRINGTYPE 3 #define AST__STRINGTYPE 3
skipping to change at line 2016 skipping to change at line 2021
int match_end; int match_end;
int active_unit; int active_unit;
int max_axes; int max_axes;
int min_axes; int min_axes;
int naxes; int naxes;
int permute; int permute;
int preserve_axes; int preserve_axes;
AstSystemType system; AstSystemType system;
AstSystemType alignsystem; AstSystemType alignsystem;
int flags; int flags;
struct AstFrameSet *variants;
} AstFrame; } AstFrame;
typedef struct AstLineDef { typedef struct AstLineDef {
AstFrame *frame; AstFrame *frame;
double length; double length;
int infinite; int infinite;
double start[2]; double start[2];
double end[2]; double end[2];
double dir[2]; double dir[2];
double q[2]; double q[2];
} AstLineDef; } AstLineDef;
struct AstFrameSet; struct AstFrameSet;
#define STATUS_PTR astGetStatusPtr #define STATUS_PTR astGetStatusPtr
#define AST__BASE (0) #define AST__BASE (0)
#define AST__CURRENT (-1) #define AST__CURRENT (-1)
#define AST__NOFRAME (-99) #define AST__NOFRAME (-99)
#define AST__ALLFRAMES (-199) #define AST__ALLFRAMES (-199)
#define AST__FRAMESET_GETALLVARIANTS_BUFF_LEN 200
#define AST__FRAMESET_GETATTRIB_BUFF_LEN 200
typedef struct AstFrameSet { typedef struct AstFrameSet {
AstFrame parent; AstFrame parent;
AstFrame **frame; AstFrame **frame;
AstMapping **map; AstMapping **map;
int *varfrm;
int *invert; int *invert;
int *link; int *link;
int *node; int *node;
int base; int base;
int current; int current;
int nframe; int nframe;
int nnode; int nnode;
} AstFrameSet; } AstFrameSet;
astPROTO_CHECK(FrameSet) astPROTO_CHECK(FrameSet)
astPROTO_ISA(FrameSet) astPROTO_ISA(FrameSet)
AstFrameSet *astFrameSetId_( void *, const char *, ... )__attribute__((form at(printf,2,3))); AstFrameSet *astFrameSetId_( void *, const char *, ... )__attribute__((form at(printf,2,3)));
AstFrame *astGetFrame_( AstFrameSet *, int, int * ); AstFrame *astGetFrame_( AstFrameSet *, int, int * );
AstMapping *astGetMapping_( AstFrameSet *, int, int, int * ); AstMapping *astGetMapping_( AstFrameSet *, int, int, int * );
void astAddFrame_( AstFrameSet *, int , AstMapping *, AstFrame *, int * ); void astAddFrame_( AstFrameSet *, int , AstMapping *, AstFrame *, int * );
void astAddVariant_( AstFrameSet *, AstMapping *, const char *, int * );
void astMirrorVariants_( AstFrameSet *, int, int * );
void astRemapFrame_( AstFrameSet *, int, AstMapping *, int * ); void astRemapFrame_( AstFrameSet *, int, AstMapping *, int * );
void astRemoveFrame_( AstFrameSet *, int, int * ); void astRemoveFrame_( AstFrameSet *, int, int * );
#define astCheckFrameSet(this) astINVOKE_CHECK(FrameSet,this,0) #define astCheckFrameSet(this) astINVOKE_CHECK(FrameSet,this,0)
#define astVerifyFrameSet(this) astINVOKE_CHECK(FrameSet,this,1) #define astVerifyFrameSet(this) astINVOKE_CHECK(FrameSet,this,1)
#define astIsAFrameSet(this) astINVOKE_ISA(FrameSet,this) #define astIsAFrameSet(this) astINVOKE_ISA(FrameSet,this)
#define astFrameSet astINVOKE(F,astFrameSetId_) #define astFrameSet astINVOKE(F,astFrameSetId_)
#define astAddFrame(this,iframe,map,frame) astINVOKE(V,astAddFrame_(astChec kFrameSet(this),iframe,(((iframe)!=AST__ALLFRAMES)?astCheckMapping(map):NUL L),astCheckFrame(frame),STATUS_PTR)) #define astAddFrame(this,iframe,map,frame) astINVOKE(V,astAddFrame_(astChec kFrameSet(this),iframe,(((iframe)!=AST__ALLFRAMES)?astCheckMapping(map):NUL L),astCheckFrame(frame),STATUS_PTR))
#define astAddVariant(this,map,name) astINVOKE(V,astAddVariant_(astCheckFra
meSet(this),map?astCheckMapping(map):NULL,name,STATUS_PTR))
#define astMirrorVariants(this,iframe) astINVOKE(V,astMirrorVariants_(astCh
eckFrameSet(this),iframe,STATUS_PTR))
#define astGetFrame(this,iframe) astINVOKE(O,astGetFrame_(astCheckFrameSet( this),iframe,STATUS_PTR)) #define astGetFrame(this,iframe) astINVOKE(O,astGetFrame_(astCheckFrameSet( this),iframe,STATUS_PTR))
#define astGetMapping(this,iframe1,iframe2) astINVOKE(O,astGetMapping_(astC heckFrameSet(this),iframe1,iframe2,STATUS_PTR)) #define astGetMapping(this,iframe1,iframe2) astINVOKE(O,astGetMapping_(astC heckFrameSet(this),iframe1,iframe2,STATUS_PTR))
#define astRemapFrame(this,iframe,map) astINVOKE(V,astRemapFrame_(astCheckF rameSet(this),iframe,astCheckMapping(map),STATUS_PTR)) #define astRemapFrame(this,iframe,map) astINVOKE(V,astRemapFrame_(astCheckF rameSet(this),iframe,astCheckMapping(map),STATUS_PTR))
#define astRemoveFrame(this,iframe) astINVOKE(V,astRemoveFrame_(astCheckFra meSet(this),iframe,STATUS_PTR)) #define astRemoveFrame(this,iframe) astINVOKE(V,astRemoveFrame_(astCheckFra meSet(this),iframe,STATUS_PTR))
astPROTO_CHECK(Frame) astPROTO_CHECK(Frame)
astPROTO_ISA(Frame) astPROTO_ISA(Frame)
AstFrame *astFrameId_( int, const char *, ... )__attribute__((format(printf ,2,3))); AstFrame *astFrameId_( int, const char *, ... )__attribute__((format(printf ,2,3)));
AstFrameSet *astConvert_( AstFrame *, AstFrame *, const char *, int * ); AstFrameSet *astConvert_( AstFrame *, AstFrame *, const char *, int * );
skipping to change at line 2089 skipping to change at line 2102
double astAxOffset_( AstFrame *, int, double, double, int * ); double astAxOffset_( AstFrame *, int, double, double, int * );
double astDistance_( AstFrame *, const double[], const double[], int * ); double astDistance_( AstFrame *, const double[], const double[], int * );
double astOffset2_( AstFrame *, const double[2], double, double, double[2], int * ); double astOffset2_( AstFrame *, const double[2], double, double, double[2], int * );
int astGetActiveUnit_( AstFrame *, int * ); int astGetActiveUnit_( AstFrame *, int * );
void astIntersect_( AstFrame *, const double[2], const double[2], const dou ble[2], const double[2], double[2], int * ); void astIntersect_( AstFrame *, const double[2], const double[2], const dou ble[2], const double[2], double[2], int * );
void astMatchAxes_( AstFrame *, AstFrame *, int[], int * ); void astMatchAxes_( AstFrame *, AstFrame *, int[], int * );
void astNorm_( AstFrame *, double[], int * ); void astNorm_( AstFrame *, double[], int * );
void astOffset_( AstFrame *, const double[], const double[], double, double [], int * ); void astOffset_( AstFrame *, const double[], const double[], double, double [], int * );
void astResolve_( AstFrame *, const double [], const double [], const doubl e [], double [], double *, double *, int * ); void astResolve_( AstFrame *, const double [], const double [], const doubl e [], double [], double *, double *, int * );
void astSetActiveUnit_( AstFrame *, int, int * ); void astSetActiveUnit_( AstFrame *, int, int * );
AstFrameSet *astGetFrameVariants_( AstFrame *, int * );
void astSetFrameVariants_( AstFrame *, AstFrameSet *, int * );
AstFrame *astPickAxesId_( AstFrame *, int, const int[], AstMapping **, int * ); AstFrame *astPickAxesId_( AstFrame *, int, const int[], AstMapping **, int * );
const char *astFormatId_( AstFrame *, int, double, int * ); const char *astFormatId_( AstFrame *, int, double, int * );
int astUnformatId_( AstFrame *, int, const char *, double *, int * ); int astUnformatId_( AstFrame *, int, const char *, double *, int * );
void astPermAxesId_( AstFrame *, const int[], int * ); void astPermAxesId_( AstFrame *, const int[], int * );
#define astCheckFrame(this) astINVOKE_CHECK(Frame,this,0) #define astCheckFrame(this) astINVOKE_CHECK(Frame,this,0)
#define astVerifyFrame(this) astINVOKE_CHECK(Frame,this,1) #define astVerifyFrame(this) astINVOKE_CHECK(Frame,this,1)
#define astIsAFrame(this) astINVOKE_ISA(Frame,this) #define astIsAFrame(this) astINVOKE_ISA(Frame,this)
#define astFrame astINVOKE(F,astFrameId_) #define astFrame astINVOKE(F,astFrameId_)
 End of changes. 13 change blocks. 
7 lines changed or deleted 24 lines changed or added


 ast_err.h   ast_err.h 
skipping to change at line 468 skipping to change at line 468
/* Fit failed */ /* Fit failed */
enum { AST__NOFIT = 233934354 }; /* messid=450 */ enum { AST__NOFIT = 233934354 }; /* messid=450 */
/* A transformation generated one or more NaN values */ /* A transformation generated one or more NaN values */
enum { AST__ISNAN = 233934362 }; /* messid=451 */ enum { AST__ISNAN = 233934362 }; /* messid=451 */
/* write error */ /* write error */
enum { AST__WRERR = 233934370 }; /* messid=452 */ enum { AST__WRERR = 233934370 }; /* messid=452 */
/* Bad variant Mapping name */
enum { AST__BDVNM = 233934378 }; /* messid=453 */
/* Attempt to add a variant Mapping to a mirror Frame */
enum { AST__MIRRO = 233934386 }; /* messid=454 */
#endif /* AST_ERROR_DEFINED */ #endif /* AST_ERROR_DEFINED */
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 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/