commit - 122fda5913bc6bf993bbc73202a55e4cbd7f9c4d
commit + 347aa646fc86fca426d5f9de95884bb68f133b9a
blob - 06f0135e0873aa46dbeb8b8a6ae6d1784cab2498
blob + bd72132acb210c63ccf071d977027196114f42da
--- src/cmd/scat/dssread.c
+++ src/cmd/scat/dssread.c
#include "sky.h"
static void dodecode(Biobuf*, Pix*, int, int, uchar*);
-static long getlong(uchar*);
+static int32 getlong(uchar*);
int debug;
Img*
}
static
-long getlong(uchar *p)
+int32 getlong(uchar *p)
{
return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
}
blob - 27d04edbbf02a18ed0fe7b91d7c61d60a1828514
blob + 583a7c7dd6bafa659ec4fad09313ecbf200ba776
--- src/cmd/scat/patch.c
+++ src/cmd/scat/patch.c
(*deg)++;
}
-long
+int32
patcha(Angle ra, Angle dec)
{
ra = DEG(ra);
/* 90 */
};
-long
+int32
patch(int rah, int ram, int deg)
{
int ra, dec;
blob - f2786f6388f6bb602aaac839dbce27b8f2dfe11b
blob + b4c5b3fd0bc94924484868e68b8b24cef7696bda
--- src/cmd/scat/plate.h
+++ src/cmd/scat/plate.h
float xi;
float eta;
};
-typedef long Type;
+typedef int32 Type;
typedef struct Image Image;
struct Image
blob - e0020282e704cb2c943a26e2d5130a199696ebdc
blob + ade4ac5b36b8d78792c304e8c833533fb10ddb6a
--- src/cmd/scat/plot.c
+++ src/cmd/scat/plot.c
#include "sky.h"
/* convert to milliarcsec */
-static long c = MILLIARCSEC; /* 1 degree */
-static long m5 = 1250*60*60; /* 5 minutes of ra */
+static int32 c = MILLIARCSEC; /* 1 degree */
+static int32 m5 = 1250*60*60; /* 5 minutes of ra */
DAngle ramin;
DAngle ramax;
Planetrec *planet;
-long mapx0, mapy0;
-long mapra, mapdec;
+int32 mapx0, mapy0;
+int32 mapra, mapdec;
double mylat, mylon, mysid;
double mapscale;
double maps;
}
int
-maptoxy(long ra, long dec, double *x, double *y)
+maptoxy(int32 ra, int32 dec, double *x, double *y)
{
double lat, lon;
struct place pl;
/* end of 'heavens' section */
int
-setmap(long ramin, long ramax, long decmin, long decmax, Rectangle r, int zenithup)
+setmap(int32 ramin, int32 ramax, int32 decmin, int32 decmax, Rectangle r, int zenithup)
{
int c;
double minx, maxx, miny, maxy;
}
Point
-map(long ra, long dec)
+map(int32 ra, int32 dec)
{
double x, y;
Point p;
}
int
-bbox(long extrara, long extradec, int quantize)
+bbox(int32 extrara, int32 extradec, int quantize)
{
int i;
Record *r;
}
int
-gridra(long mapdec)
+gridra(int32 mapdec)
{
mapdec = abs(mapdec)+c/2;
mapdec /= c;
{
int i, j, k;
char *t;
- long x, y;
+ int32 x, y;
int ra, dec;
int m;
Point p, pts[10];
blob - f8c1ee6e6b62cdcf8ba3a7e37759d88c650d97e1
blob + 26bea1c3ac2b525eae706dafca58915e87bbcbfc
--- src/cmd/scat/scat.c
+++ src/cmd/scat/scat.c
Mindexrec mindex[NMrec];
Namerec name[NName];
Bayerec bayer[NBayer];
-long con[MAXcon];
+int32 con[MAXcon];
ushort conindex[Ncon+1];
-long patchaddr[Npatch+1];
+int32 patchaddr[Npatch+1];
Record *rec;
Record *orec;
int conindexdb;
int patchdb;
char parsed[3];
-long nrec;
-long nreca;
-long norec;
-long noreca;
+int32 nrec;
+int32 nreca;
+int32 norec;
+int32 noreca;
Biobuf bin;
Biobuf bout;
void
-Eread(int f, char *name, void *addr, long n)
+Eread(int f, char *name, void *addr, int32 n)
{
if(read(f, addr, n) != n){ /* BUG! */
fprint(2, "scat: read error on %s\n", name);
return skipbl(s);
}
-/* produce little-endian long at address l */
-long
-Long(long *l)
+/* produce little-endian int32 at address l */
+int32
+Long(int32 *l)
{
uchar *p;
p = (uchar*)l;
- return (long)p[0]|((long)p[1]<<8)|((long)p[2]<<16)|((long)p[3]<<24);
+ return (int32)p[0]|((int32)p[1]<<8)|((int32)p[2]<<16)|((int32)p[3]<<24);
}
-/* produce little-endian long at address l */
+/* produce little-endian int32 at address l */
int
Short(short *s)
{
patchopen(void)
{
Biobuf *b;
- long l, m;
+ int32 l, m;
char buf[100];
if(patchdb == 0){
}
int
-loadngc(long index)
+loadngc(int32 index)
{
static int failed;
- long j;
+ int32 j;
ngcopen();
j = (index-1)*sizeof(NGCrec);
}
int
-loadabell(long index)
+loadabell(int32 index)
{
- long j;
+ int32 j;
abellopen();
j = index-1;
}
int
-loadpatch(long index)
+loadpatch(int32 index)
{
int i;
{
int i, j, notflat;
Record *or;
- long key;
+ int32 key;
loop:
copy();
int i;
int x, y;
Record *or;
- long dec, ra, ndec, nra;
+ int32 dec, ra, ndec, nra;
int rdeg;
flatten();
int i;
int x, y, xx;
Record *or;
- long min, circle;
+ int32 min, circle;
double factor;
flatten();
pplate(char *flags)
{
int i;
- long c;
+ int32 c;
int na, rah, ram, d1, d2;
double r0;
int ra, dec;
- long ramin, ramax, decmin, decmax; /* all in degrees */
+ int32 ramin, ramax, decmin, decmax; /* all in degrees */
Record *r;
int folded;
Angle racenter, deccenter, rasize, decsize, a[4];
char *starts, *inputline=s, *t, *u;
Record *r;
Rune c;
- long n;
+ int32 n;
double x;
Angle ra;
Abellrec *a;
Planetrec *p;
int i, rah, ram, dec, nn;
- long key;
+ int32 key;
if(r) switch(r->type){
default:
blob - 53045853dfb473db3ac083f5b358972ac01b56bd
blob + 158dd1c71aaf2495426e03144cc32297f18058dc
--- src/cmd/scat/sky.h
+++ src/cmd/scat/sky.h
+typedef s32int int32;
+
#define DIR "#9/sky"
/*
* This code reflects many years of changes. There remain residues
#define NPlanet 20
typedef float Angle; /* in radians */
-typedef long DAngle; /* on disk: in units of milliarcsec */
+typedef int32 DAngle; /* on disk: in units of milliarcsec */
typedef short Mag; /* multiplied by 10 */
-typedef long Key; /* known to be 4 bytes, unfortunately */
+typedef int32 Key; /* known to be 4 bytes, unfortunately */
/*
* All integers are stored in little-endian order.
char compid[2];
char hdcode;
char pad1;
- long hd; /* HD catalog number */
+ int32 hd; /* HD catalog number */
char name[3]; /* name[0]=alpha name[1]=2 name[3]=ori */
char nname; /* number of prose names */
/* 36 bytes to here */
typedef struct Bayerec Bayerec;
struct Bayerec{
- long sao;
+ int32 sao;
char name[3];
char pad;
};
typedef struct Namerec Namerec;
struct Namerec{
- long sao;
- long ngc;
- long abell;
+ int32 sao;
+ int32 ngc;
+ int32 abell;
char name[36]; /* null terminated */
};
typedef struct Patchrec Patchrec;
struct Patchrec{
int nkey;
- long key[60];
+ int32 key[60];
};
typedef struct Record Record;
struct Record{
Type type;
- long index;
+ int32 index;
union{
SAOrec sao;
NGCrec ngc;
float xi;
float eta;
};
-typedef long Pix;
+typedef int32 Pix;
typedef struct Img Img;
struct Img
extern char *desctab[][2];
extern Name names[];
extern Record *rec;
-extern long nrec;
+extern int32 nrec;
extern Planetrec *planet;
/* for bbox: */
extern int folded;
extern int parsename(char*);
extern void radec(int, int*, int*, int*);
extern int btag(short);
-extern long patcha(Angle, Angle);
-extern long patch(int, int, int);
+extern int32 patcha(Angle, Angle);
+extern int32 patch(int, int, int);
extern char*hms(Angle);
extern char*dms(Angle);
extern char*ms(Angle);
extern char*dm(Angle);
extern char*deg(Angle);
extern char*hm5(Angle);
-extern long dangle(Angle);
+extern int32 dangle(Angle);
extern Angle angle(DAngle);
extern void prdesc(char*, char*(*)[2], short*);
extern double xsqrt(double);
extern char* alpha(char*, char*);
extern char* skipbl(char*);
extern void flatten(void);
-extern int bbox(long, long, int);
+extern int bbox(int32, int32, int);
extern int inbbox(DAngle, DAngle);
extern char* nameof(Record*);