artoolkit-commits

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

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

Modified Files:
	main.c calib_camera.h 
Log Message:
Step 2 of cleanup.

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.c	10 Aug 2005 18:16:51 -0000	1.5
--- main.c	1 Sep 2005 01:07:58 -0000	1.6
***************
*** 1,8 ****
  #ifdef _WIN32
! #include <windows.h>
  #endif
  #include <math.h>
  #include <stdio.h>
  #include <stdlib.h>
  #ifndef __APPLE__
  #  include <GL/glut.h>
--- 1,33 ----
+ /*
[...1584 lines suppressed...]
!     ARParam  param;
!     int      i, j;
! 	
!     param.xsize = gXsize;
!     param.ysize = gYsize;
!     for (i = 0; i < 4; i++) param.dist_factor[i] = dist_factor[i];
!     for (j = 0; j < 3; j++) {
!         for (i = 0; i < 4; i++) {
!             param.mat[j][i] = mat[j][i];
!         }
!     }
!     arParamDisp( &param );
! 	
!     printf("Filename: ");
!     scanf( "%s", name );
!     arParamSave( name, 1, &param );
! 	
!     return;
  }
+ 

Index: calib_camera.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calib_camera.h	10 Aug 2005 18:18:21 -0000	1.2
--- calib_camera.h	1 Sep 2005 01:07:58 -0000	1.3
***************
*** 2,9 ****
  #define CALIB_DIST_H
  
  #define  H_NUM        6
  #define  V_NUM        4
  #define  LOOP_MAX    20
! #define  THRESH     200
  
  typedef struct {
--- 2,11 ----
  #define CALIB_DIST_H
  
+ #include <AR/gsub_lite.h>
+ 
  #define  H_NUM        6
  #define  V_NUM        4
  #define  LOOP_MAX    20
! #define  THRESH     100
  
  typedef struct {
***************
*** 14,17 ****
--- 16,20 ----
  typedef struct patt {
      unsigned char  *savedImage[LOOP_MAX];
+ 	ARGL_CONTEXT_SETTINGS_REF arglSettings[LOOP_MAX];
      CALIB_COORD_T  *world_coord;
      CALIB_COORD_T  *point[LOOP_MAX];