[uts-cvs] uts/src/cam/camfits.st4 main.c,1.1.1.1,1.2

[Andr? L. A. <st...@us...>]

Update of /cvsroot/uts/uts/src/cam/camfits.st4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15992/src/cam/camfits.st4

Modified Files:
	main.c 
Log Message:
1. camfits.st7 will now compile with includes and libs defined by --with-LALALA.

2. better variable names in camfits.fake and camfits.st4.

3. include includes in CXXFLAGS in configure.ac.


Index: main.c
===================================================================
RCS file: /cvsroot/uts/uts/src/cam/camfits.st4/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.c	29 Jan 2004 03:02:40 -0000	1.1.1.1
--- main.c	31 Mar 2004 16:54:21 -0000	1.2
***************
*** 10,14 ****
  #define FALSE (0)
  
! int getimage(cam_info *camera, float texp, char *bfname, int index);
  int fileexists(char *fname);
  void usage(void);
--- 10,14 ----
  #define FALSE (0)
  
! int getimage(cam_info *camera, float texp, char *bfname, int imindex);
  int fileexists(char *fname);
  void usage(void);
***************
*** 28,32 ****
  char *porta;        /* Serial port */
  char *bfname;       /* Image base-file-name */
! int index;          /* index to bfname */
  float texp;         /* Exposure time */
  fitsfile *fptr;     /* Image file */
--- 28,32 ----
  char *porta;        /* Serial port */
  char *bfname;       /* Image base-file-name */
! int imindex;          /* index to bfname */
  float texp;         /* Exposure time */
  fitsfile *fptr;     /* Image file */
***************
*** 89,93 ****
  /* get index */
  	if (!output) {
! 		res = sscanf(argv[7], "%d", &index);
  		if (res != 1) {
  			fprintf(stderr, "\nError: \"%s\" is an invalid index.\n\n", argv[2]);
--- 89,93 ----
  /* get index */
  	if (!output) {
! 		res = sscanf(argv[7], "%d", &imindex);
  		if (res != 1) {
  			fprintf(stderr, "\nError: \"%s\" is an invalid index.\n\n", argv[2]);
***************
*** 117,121 ****
  	for (nimg = 0; nimg < nexp; nimg++) {
  		fprintf(stderr, "\nTaking image #%d.\n", nimg);
! 		getimage(camera, texp, bfname, (nimg + index));
  		if (stop_imaging) break;
  	}
--- 117,121 ----
  	for (nimg = 0; nimg < nexp; nimg++) {
  		fprintf(stderr, "\nTaking image #%d.\n", nimg);
! 		getimage(camera, texp, bfname, (nimg + imindex));
  		if (stop_imaging) break;
  	}
***************
*** 126,130 ****
  
  
! int getimage(cam_info *camera, float texp, char *bfname, int index)
  {
  	char fname[128];
--- 126,130 ----
  
  
! int getimage(cam_info *camera, float texp, char *bfname, int imindex)
  {
  	char fname[128];
***************
*** 150,154 ****
  		fprintf(stderr, "\nDone.\n");
  	} else {
! 		sprintf(fname, "%s%04d.fits", bfname, index);
  		fprintf(stderr, "Saving image %s...", fname);
  		if (fileexists(fname))
--- 150,154 ----
  		fprintf(stderr, "\nDone.\n");
  	} else {
! 		sprintf(fname, "%s%04d.fits", bfname, imindex);
  		fprintf(stderr, "Saving image %s...", fname);
  		if (fileexists(fname))