[artoolkit-commits] artoolkit/util/calib_cparam calib_cparam.c,1.7,1.8

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

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

Modified Files:
	calib_cparam.c 
Log Message:
Step 2 of cleanup.

Index: calib_cparam.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** calib_cparam.c	30 Aug 2005 18:36:10 -0000	1.7
--- calib_cparam.c	14 Sep 2005 19:10:57 -0000	1.8
***************
*** 1,4 ****
  #ifdef _WIN32
! #include <windows.h>
  #endif
  #include <stdio.h>
--- 1,28 ----
+ /*
+  * 
+  * This file is part of ARToolKit.
+  * 
+  * ARToolKit is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  * 
+  * ARToolKit is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with ARToolKit; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  * 
+  */
+ 
+ // ============================================================================
+ //	Includes
+ // ============================================================================
+ 
  #ifdef _WIN32
! #  include <windows.h>
  #endif
  #include <stdio.h>
***************
*** 18,21 ****
--- 42,46 ----
  #include <AR/video.h>
  #include <AR/param.h>
+ #include <AR/gsub_lite.h>
  #include "calib_cparam.h"
  
***************
*** 310,317 ****
      int      k = 1;
  
!     if( mode == 0 ) return;
  
!     if( line_mode[line_no] == L_HORIZONTAL ) {
!         switch( key ) {
              case GLUT_KEY_UP:
                  radius -= 1.0;
--- 335,342 ----
      int      k = 1;
  
!     if (mode == 0) return;
  
!     if (line_mode[line_no] == L_HORIZONTAL) {
!         switch (key) {
              case GLUT_KEY_UP:
                  radius -= 1.0;
***************
*** 338,344 ****
                  break;
          }
!     }
!     else {
!         switch( key ) {
              case GLUT_KEY_UP:
                  mx = (sx + ex)/ 2.0;
--- 363,368 ----
                  break;
          }
!     } else {
!         switch (key) {
              case GLUT_KEY_UP:
                  mx = (sx + ex)/ 2.0;
***************
*** 367,371 ****
      }
  
!     if( k ) refresh = 1;
  }
  
--- 391,395 ----
      }
  
!     if (k) refresh = 1;
  }