[artoolkit-commits] artoolkit/util/calib_camera2 main.c,1.8,1.9

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

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

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

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.c	22 Sep 2005 00:44:37 -0000	1.8
--- main.c	5 Apr 2006 05:48:33 -0000	1.9
***************
*** 227,232 ****
  	}
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
! 	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
--- 227,232 ----
  	}
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
! 	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE_DEFAULT);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE_DEFAULT);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
***************
*** 412,437 ****
          p1 = gClipImage;
          for (j = ssy; j <= eey; j++) {
!             p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE]);
              for (i = ssx; i <= eex; i++) {
! #if defined(AR_PIX_FORMAT_BGRA)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_ABGR)
                  *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_ARGB)
                  *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_BGR)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_RGBA)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_RGB)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_2vuy)
                  *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255);
! #elif defined(AR_PIX_FORMAT_yuvs)
                  *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255);
  #else
! #  error Unknown pixel format defined in config.h
  #endif
!                 p  += AR_PIX_SIZE;
                  p1++;
              }
--- 412,437 ----
          p1 = gClipImage;
          for (j = ssy; j <= eey; j++) {
!             p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]);
              for (i = ssx; i <= eex; i++) {
! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR)
                  *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB)
                  *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB)
                  *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy)
                  *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255);
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs)
                  *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255);
  #else
! #  error Unknown default pixel format defined in config.h
  #endif
!                 p  += AR_PIX_SIZE_DEFAULT;
                  p1++;
              }