artoolkit-commits

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

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

Modified Files:
	calib_cparam.c 
Log Message:
Move pixel format from gsub_lite into global namespace.

Index: calib_cparam.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** calib_cparam.c	22 Sep 2005 00:44:41 -0000	1.10
--- calib_cparam.c	5 Apr 2006 05:47:51 -0000	1.11
***************
*** 157,161 ****
  	}
  	arglDistortionCompensationSet(gSaveArglSettings, FALSE);
! 	arMalloc(gSaveARTImage, unsigned char, gXsize*gYsize*AR_PIX_SIZE);
  
  	// Register GLUT event-handling callbacks.
--- 157,161 ----
  	}
  	arglDistortionCompensationSet(gSaveArglSettings, FALSE);
! 	arMalloc(gSaveARTImage, unsigned char, gXsize*gYsize*AR_PIX_SIZE_DEFAULT);
  
  	// Register GLUT event-handling callbacks.
***************
*** 208,212 ****
  	
  	// Allocate space for a save image.
! 	arMalloc(gSaveARTImage, unsigned char, gXsize * gYsize * AR_PIX_SIZE);
  	
      param.xsize = gXsize;
--- 208,212 ----
  	
  	// Allocate space for a save image.
! 	arMalloc(gSaveARTImage, unsigned char, gXsize * gYsize * AR_PIX_SIZE_DEFAULT);
  	
      param.xsize = gXsize;
***************
*** 280,284 ****
  				image = arVideoGetImage();
  			} while (image == NULL);
! 			memcpy(gSaveARTImage, image, gXsize*gYsize*AR_PIX_SIZE);
  			printf("Grabbed image.\n");
  			arVideoCapStop();
--- 280,284 ----
  				image = arVideoGetImage();
  			} while (image == NULL);
! 			memcpy(gSaveARTImage, image, gXsize*gYsize*AR_PIX_SIZE_DEFAULT);
  			printf("Grabbed image.\n");
  			arVideoCapStop();