AST_ERR   AST_ERR 
skipping to change at line 627 skipping to change at line 627
INTEGER AST__BDVNM INTEGER AST__BDVNM
PARAMETER ( AST__BDVNM = 233934378 ) PARAMETER ( AST__BDVNM = 233934378 )
* Attempt to add a variant Mapping to a mirror Frame * Attempt to add a variant Mapping to a mirror Frame
INTEGER AST__MIRRO INTEGER AST__MIRRO
PARAMETER ( AST__MIRRO = 233934386 ) PARAMETER ( AST__MIRRO = 233934386 )
* Error in cminpack Levenberg-Marquardt code * Error in cminpack Levenberg-Marquardt code
INTEGER AST__MNPCK INTEGER AST__MNPCK
PARAMETER ( AST__MNPCK = 233934394 ) PARAMETER ( AST__MNPCK = 233934394 )
* Supplied array has too many pixels
INTEGER AST__EXSPIX
PARAMETER ( AST__EXSPIX = 233934402 )
* No mapping found between coordinate systems
INTEGER AST__NOCNV
PARAMETER ( AST__NOCNV = 233934410 )
 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
* 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:
* 21-OCT-2014 (makeh): * 18-APR-2015 (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 481 skipping to change at line 481
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 *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 * );
void astChrTrunc_( char *, 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(str1,nc,str2) astERROR_INVOKE(astAppendString_(str1 ,nc,str2,STATUS_PTR)) #define astAppendString(str1,nc,str2) astERROR_INVOKE(astAppendString_(str1 ,nc,str2,STATUS_PTR))
#define astAppendStringf astAppendStringf_ #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 astChrTrunc(string) astERROR_INVOKE(astChrTrunc_(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)
#define astChrSplit(str,n) astERROR_INVOKE(astChrSplit_(str,n,STATUS_PTR)) #define astChrSplit(str,n) astERROR_INVOKE(astChrSplit_(str,n,STATUS_PTR))
#define astChrSplitC(str,c,n) astERROR_INVOKE(astChrSplitC_(str,c,n,STATUS_ PTR)) #define astChrSplitC(str,c,n) astERROR_INVOKE(astChrSplitC_(str,c,n,STATUS_ PTR))
#define astChrSplitRE(str,c,n,m) astERROR_INVOKE(astChrSplitRE_(str,c,n,m,S TATUS_PTR)) #define astChrSplitRE(str,c,n,m) astERROR_INVOKE(astChrSplitRE_(str,c,n,m,S TATUS_PTR))
#define astActiveMemory(label) #define astActiveMemory(label)
skipping to change at line 533 skipping to change at line 535
/* ====== */ /* ====== */
/* 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 2 #define AST__RELEASE 4
#define AST_MAJOR_VERS 8 #define AST_MAJOR_VERS 8
#define AST_MINOR_VERS 0 #define AST_MINOR_VERS 0
#define AST_RELEASE 2 #define AST_RELEASE 4
#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 1234 skipping to change at line 1236
enum { AST__ISNAN = 233934362 }; enum { AST__ISNAN = 233934362 };
enum { AST__WRERR = 233934370 }; enum { AST__WRERR = 233934370 };
enum { AST__BDVNM = 233934378 }; enum { AST__BDVNM = 233934378 };
enum { AST__MIRRO = 233934386 }; enum { AST__MIRRO = 233934386 };
enum { AST__MNPCK = 233934394 }; enum { AST__MNPCK = 233934394 };
enum { AST__EXSPIX = 233934402 };
enum { AST__NOCNV = 233934410 };
/* 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 2872 skipping to change at line 2878
void astCurve_( AstPlot *, const double [], const double [], int * ); void astCurve_( AstPlot *, const double [], const double [], int * );
void astEBuf_( AstPlot *, int * ); void astEBuf_( AstPlot *, int * );
void astGenCurve_( AstPlot *, AstMapping *, int * ); void astGenCurve_( AstPlot *, AstMapping *, int * );
void astGrfPop_( AstPlot *, int * ); void astGrfPop_( AstPlot *, int * );
void astGrfPush_( AstPlot *, int * ); void astGrfPush_( AstPlot *, int * );
void astGrfSet_( AstPlot *, const char *, AstGrfFun, int * ); void astGrfSet_( AstPlot *, const char *, AstGrfFun, int * );
void astGridLine_( AstPlot *, int, const double [], double, int * ); void astGridLine_( AstPlot *, int, const double [], double, int * );
void astGrid_( AstPlot *, int * ); void astGrid_( AstPlot *, int * );
void astMark_( AstPlot *, int, int, int, const double *, int, int * ); void astMark_( AstPlot *, int, int, int, const double *, int, int * );
void astPolyCurve_( AstPlot *, int, int, int, const double *, int * ); void astPolyCurve_( AstPlot *, int, int, int, const double *, int * );
void astRegionOutline_( AstPlot *, AstRegion *, int * );
void astText_( AstPlot *, const char *, const double [], const float [], const char *, int * ); void astText_( AstPlot *, const char *, const double [], const float [], const char *, int * );
void astGrfWrapper_( AstPlot *, const char *, AstGrfWrap, int * ); void astGrfWrapper_( AstPlot *, const char *, AstGrfWrap, int * );
int astGrfFunID_( const char *, const char *, const char *, int * ); int astGrfFunID_( const char *, const char *, const char *, int * );
#define astCheckPlot(this) astINVOKE_CHECK(Plot,this,0) #define astCheckPlot(this) astINVOKE_CHECK(Plot,this,0)
#define astVerifyPlot(this) astINVOKE_CHECK(Plot,this,1) #define astVerifyPlot(this) astINVOKE_CHECK(Plot,this,1)
#define astIsAPlot(this) astINVOKE_ISA(Plot,this) #define astIsAPlot(this) astINVOKE_ISA(Plot,this)
#define astPlot astINVOKE(F,astPlotId_) #define astPlot astINVOKE(F,astPlotId_)
skipping to change at line 2904 skipping to change at line 2911
#define astGrid(this) astINVOKE(V,astGrid_(astCheckPlot(this),STATUS_PTR)) #define astGrid(this) astINVOKE(V,astGrid_(astCheckPlot(this),STATUS_PTR))
#define astGridLine(this,axis,start,length) astINVOKE(V,astGridLine_(astChe ckPlot(this),axis,start,length,STATUS_PTR)) #define astGridLine(this,axis,start,length) astINVOKE(V,astGridLine_(astChe ckPlot(this),axis,start,length,STATUS_PTR))
#define astCurve(this,start,finish) astINVOKE(V,astCurve_(astCheckPlot(this ),start,finish,STATUS_PTR)) #define astCurve(this,start,finish) astINVOKE(V,astCurve_(astCheckPlot(this ),start,finish,STATUS_PTR))
#define astGenCurve(this,map) astINVOKE(V,astGenCurve_(astCheckPlot(this),a stCheckMapping(map),STATUS_PTR)) #define astGenCurve(this,map) astINVOKE(V,astGenCurve_(astCheckPlot(this),a stCheckMapping(map),STATUS_PTR))
#define astPolyCurve(this,npoint,ncoord,dim,in) astINVOKE(V,astPolyCurve_(a stCheckPlot(this),npoint,ncoord,dim,in,STATUS_PTR)) #define astPolyCurve(this,npoint,ncoord,dim,in) astINVOKE(V,astPolyCurve_(a stCheckPlot(this),npoint,ncoord,dim,in,STATUS_PTR))
#define astRegionOutline(this,region) astINVOKE(V,astRegionOutline_(astChec
kPlot(this),astCheckRegion(region),STATUS_PTR))
#define astGrfSet(this,name,fun) astINVOKE(V,astGrfSet_(astCheckPlot(this), name,fun,STATUS_PTR)) #define astGrfSet(this,name,fun) astINVOKE(V,astGrfSet_(astCheckPlot(this), name,fun,STATUS_PTR))
#define astGrfPush(this) astINVOKE(V,astGrfPush_(astCheckPlot(this),STATUS_ PTR)) #define astGrfPush(this) astINVOKE(V,astGrfPush_(astCheckPlot(this),STATUS_ PTR))
#define astGrfPop(this) astINVOKE(V,astGrfPop_(astCheckPlot(this),STATUS_PT R)) #define astGrfPop(this) astINVOKE(V,astGrfPop_(astCheckPlot(this),STATUS_PT R))
#define astBBuf(this) astINVOKE(V,astBBuf_(astCheckPlot(this),STATUS_PTR)) #define astBBuf(this) astINVOKE(V,astBBuf_(astCheckPlot(this),STATUS_PTR))
#define astEBuf(this) astINVOKE(V,astEBuf_(astCheckPlot(this),STATUS_PTR)) #define astEBuf(this) astINVOKE(V,astEBuf_(astCheckPlot(this),STATUS_PTR))
 End of changes. 8 change blocks. 
3 lines changed or deleted 13 lines changed or added


 ast_err.h   ast_err.h 
skipping to change at line 477 skipping to change at line 477
/* Bad variant Mapping name */ /* Bad variant Mapping name */
enum { AST__BDVNM = 233934378 }; /* messid=453 */ enum { AST__BDVNM = 233934378 }; /* messid=453 */
/* Attempt to add a variant Mapping to a mirror Frame */ /* Attempt to add a variant Mapping to a mirror Frame */
enum { AST__MIRRO = 233934386 }; /* messid=454 */ enum { AST__MIRRO = 233934386 }; /* messid=454 */
/* Error in cminpack Levenberg-Marquardt code */ /* Error in cminpack Levenberg-Marquardt code */
enum { AST__MNPCK = 233934394 }; /* messid=455 */ enum { AST__MNPCK = 233934394 }; /* messid=455 */
/* Supplied array has too many pixels */
enum { AST__EXSPIX = 233934402 }; /* messid=456 */
/* No mapping found between coordinate systems */
enum { AST__NOCNV = 233934410 }; /* messid=457 */
#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/