[artoolkit-commits] artoolkit/util/calib_distortion calib_dist.c,1.9,1.10

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18115

Modified Files:
	calib_dist.c 
Log Message:
Change control flow around grab start/stop.

Index: calib_dist.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** calib_dist.c	14 Sep 2005 19:11:16 -0000	1.9
--- calib_dist.c	15 Sep 2005 00:52:03 -0000	1.10
***************
*** 151,155 ****
  	
  	// Start grabbing.
!     point_num = 0;
      gStatus = 0;
      print_comment(0);
--- 151,159 ----
  	
  	// Start grabbing.
! 	if (arVideoCapStart() != 0) {
!     	fprintf(stderr, "init(): Unable to begin camera data capture.\n");
! 		return (FALSE);		
! 	}
! 	point_num = 0;
      gStatus = 0;
      print_comment(0);
***************
*** 190,198 ****
  	arMalloc(gClipImage, unsigned char, gXsize * gYsize);
  	
- 	if (arVideoCapStart() != 0) {
-     	fprintf(stderr, "init(): Unable to begin camera data capture.\n");
- 		return (FALSE);		
- 	}
- 	
  	return (TRUE);
  }
--- 194,197 ----
***************
*** 211,215 ****
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
! 		fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n");
  		exit(-1);
  	}
--- 210,214 ----
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
! 		fprintf(stderr, "grabImage(): arglSetupForCurrentContext() returned error.\n");
  		exit(-1);
  	}
***************
*** 218,222 ****
  	memcpy((gPatt.savedImage)[gPatt.loop_num-1], gARTImage, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
- 	arVideoCapStop();
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
  }
--- 217,220 ----
***************
*** 298,301 ****
--- 296,300 ----
  				grabImage();
  				gDragStartX = gDragStartY = gDragEndX = gDragEndY = -1;
+ 				arVideoCapStop();
  				gStatus = 1;
  				print_comment(1);