[artoolkit-commits] artoolkit/examples/twoView twoView.c,1.5,1.6

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

Update of /cvsroot/artoolkit/artoolkit/examples/twoView
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20876

Modified Files:
	twoView.c 
Log Message:
Fix spelling, FPS counter.

Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** twoView.c	18 Feb 2005 04:18:22 -0000	1.5
--- twoView.c	10 Mar 2005 03:58:16 -0000	1.6
***************
*** 228,232 ****
  		// Open the video path.
  		if ((gContextsActive[i].ARTVideo = ar2VideoOpen(vconfs[i])) == NULL) {
! 			fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera %d.\n", i + 1);
  			return (FALSE);
  		}
--- 228,232 ----
  		// Open the video path.
  		if ((gContextsActive[i].ARTVideo = ar2VideoOpen(vconfs[i])) == NULL) {
! 			fprintf(stderr, "demoARSetupCameras(): Unable to open connection to camera %d.\n", i + 1);
  			return (FALSE);
  		}
***************
*** 234,242 ****
  		// Find the size of the window.
  		if (ar2VideoInqSize(gContextsActive[i].ARTVideo, &xsize, &ysize) < 0) return (FALSE);
! 		fprintf(stderr, "demoARSetupCamera(): Camera %d image size (x,y) = (%d,%d)\n", i + 1, xsize, ysize);
  
  		// Load the camera parameters, resize for the window and init.
  		if (arParamLoad(cparam_names[i], 1, &wparam) < 0) {
! 			fprintf(stderr, "demoARSetupCamera(): Error loading parameter file %s for camera %d.\n", cparam_names[i], i + 1);
  			return (FALSE);
  		}
--- 234,242 ----
  		// Find the size of the window.
  		if (ar2VideoInqSize(gContextsActive[i].ARTVideo, &xsize, &ysize) < 0) return (FALSE);
! 		fprintf(stderr, "demoARSetupCameras(): Camera %d image size (x,y) = (%d,%d)\n", i + 1, xsize, ysize);
  
  		// Load the camera parameters, resize for the window and init.
  		if (arParamLoad(cparam_names[i], 1, &wparam) < 0) {
! 			fprintf(stderr, "demoARSetupCameras(): Error loading parameter file %s for camera %d.\n", cparam_names[i], i + 1);
  			return (FALSE);
  		}
***************
*** 248,252 ****
  		// Start the video capture for this camera.
  		if (ar2VideoCapStart(gContextsActive[i].ARTVideo) != 0) {
! 			fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture for camera %d.\n", i + 1);
  			return (FALSE);		
  		}
--- 248,252 ----
  		// Start the video capture for this camera.
  		if (ar2VideoCapStart(gContextsActive[i].ARTVideo) != 0) {
! 			fprintf(stderr, "demoARSetupCameras(): Unable to begin camera data capture for camera %d.\n", i + 1);
  			return (FALSE);		
  		}
***************
*** 353,356 ****
--- 353,357 ----
  			}
  			arUtilTimerReset();
+ 			gCallCountGetImage = 0;
  			demoARDebugReportMode();
  			break;
***************
*** 479,483 ****
  				  &(gContextsActive[drawContextIndex].ARTCparam),
  				  1.0,
! 				  gContextsActive[drawContextIndex].arglSettings);	// zoom = 1.0, contextIndex = 0.
  	ar2VideoCapNext(gContextsActive[drawContextIndex].ARTVideo);
  	
--- 480,484 ----
  				  &(gContextsActive[drawContextIndex].ARTCparam),
  				  1.0,
! 				  gContextsActive[drawContextIndex].arglSettings);	// zoom = 1.0.
  	ar2VideoCapNext(gContextsActive[drawContextIndex].ARTVideo);