[artoolkit-commits] artoolkit/util/calib_camera2 calib_camera.h,1.3,1.4 Makefile.in,1.1.1.1,1.2 main

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	calib_camera.h Makefile.in main.c calib_camera2.dsp 
	calib_camera2.vcproj 
Log Message:
Step 2 of cleanup.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	4 Nov 2004 08:52:06 -0000	1.1.1.1
--- Makefile.in	14 Sep 2005 19:11:03 -0000	1.2
***************
*** 4,8 ****

  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)

--- 4,8 ----

  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub_lite -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)

Index: calib_camera2.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calib_camera2.vcproj	23 Jul 2005 00:02:32 -0000	1.2
--- calib_camera2.vcproj	14 Sep 2005 19:11:03 -0000	1.3
***************
*** 1,126 ****
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="calib_camera2"
! 	ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}">
! 	<Platforms>
! 		<Platform
! 			Name="Win32"/>
! 	</Platforms>
! 	<Configurations>
! 		<Configuration
! 			Name="Debug|Win32"
! 			OutputDirectory="Debug"
! 			IntermediateDirectory="Debug"
! 			ConfigurationType="1">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
! 				PreprocessorDefinitions="WIN32;_DEBUG"
! 				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				BrowseInformation="1"
! 				WarningLevel="3"
! 				DebugInformationFormat="3"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"
! 				GenerateDebugInformation="TRUE"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 		<Configuration
! 			Name="Release|Win32"
! 			OutputDirectory="Release"
! 			IntermediateDirectory="Release"
! 			ConfigurationType="1"
! 			WholeProgramOptimization="TRUE">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
! 				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
! 				PreprocessorDefinitions="WIN32;NDEBUG"
! 				RuntimeLibrary="0"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 	</Configurations>
! 	<References>
! 	</References>
! 	<Files>
! 		<File
! 			RelativePath="calib_camera.h">
! 		</File>
! 		<File
! 			RelativePath="calib_dist.c">
! 		</File>
! 		<File
! 			RelativePath="calib_inp.c">
! 		</File>
! 		<File
! 			RelativePath="main.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>
--- 1,126 ----
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="calib_camera2"
! 	ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}">
! 	<Platforms>
! 		<Platform
! 			Name="Win32"/>
! 	</Platforms>
! 	<Configurations>
! 		<Configuration
! 			Name="Debug|Win32"
! 			OutputDirectory="Debug"
! 			IntermediateDirectory="Debug"
! 			ConfigurationType="1">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
! 				PreprocessorDefinitions="WIN32;_DEBUG"
! 				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				BrowseInformation="1"
! 				WarningLevel="3"
! 				DebugInformationFormat="3"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"
! 				GenerateDebugInformation="TRUE"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 		<Configuration
! 			Name="Release|Win32"
! 			OutputDirectory="Release"
! 			IntermediateDirectory="Release"
! 			ConfigurationType="1"
! 			WholeProgramOptimization="TRUE">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
! 				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
! 				PreprocessorDefinitions="WIN32;NDEBUG"
! 				RuntimeLibrary="0"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 	</Configurations>
! 	<References>
! 	</References>
! 	<Files>
! 		<File
! 			RelativePath="calib_camera.h">
! 		</File>
! 		<File
! 			RelativePath="calib_dist.c">
! 		</File>
! 		<File
! 			RelativePath="calib_inp.c">
! 		</File>
! 		<File
! 			RelativePath="main.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>

Index: calib_camera2.dsp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** calib_camera2.dsp	4 Nov 2004 08:52:01 -0000	1.1.1.1
--- calib_camera2.dsp	14 Sep 2005 19:11:03 -0000	1.2
***************
*** 1,118 ****
! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
! 
! CFG=calib_camera2 - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE 
! !MESSAGE NMAKE /f "calib_camera2.mak".
! !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE 
! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE 
! 
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
! 
! !IF  "$(CFG)" == "calib_camera2 - Win32 Release"
! 
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Release"
! # PROP Intermediate_Dir "Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
! # SUBTRACT CPP /YX
! # ADD BASE RSC /l 0x1409 /d "NDEBUG"
! # ADD RSC /l 0x1409 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/calib_camera2.exe" /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ELSEIF  "$(CFG)" == "calib_camera2 - Win32 Debug"
! 
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
! # PROP Intermediate_Dir "Debug"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
! # SUBTRACT CPP /YX
! # ADD BASE RSC /l 0x1409 /d "_DEBUG"
! # ADD RSC /l 0x1409 /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsubd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib"
! # SUBTRACT LINK32 /pdb:none
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "calib_camera2 - Win32 Release"
! # Name "calib_camera2 - Win32 Debug"
! # Begin Group "Source Files"
! 
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
! 
! SOURCE=.\calib_dist.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\calib_inp.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\main.c
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl"
! # Begin Source File
! 
! SOURCE=.\calib_camera.h
! # End Source File
! # End Group
! # Begin Group "Resource Files"
! 
! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
! # End Group
! # End Target
! # End Project
--- 1,118 ----
! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
! 
! CFG=calib_camera2 - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE 
! !MESSAGE NMAKE /f "calib_camera2.mak".
! !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE 
! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE 
! 
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
! 
! !IF  "$(CFG)" == "calib_camera2 - Win32 Release"
! 
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Release"
! # PROP Intermediate_Dir "Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
! # SUBTRACT CPP /YX
! # ADD BASE RSC /l 0x1409 /d "NDEBUG"
! # ADD RSC /l 0x1409 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/calib_camera2.exe" /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ELSEIF  "$(CFG)" == "calib_camera2 - Win32 Debug"
! 
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
! # PROP Intermediate_Dir "Debug"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
! # SUBTRACT CPP /YX
! # ADD BASE RSC /l 0x1409 /d "_DEBUG"
! # ADD RSC /l 0x1409 /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib"
! # SUBTRACT LINK32 /pdb:none
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "calib_camera2 - Win32 Release"
! # Name "calib_camera2 - Win32 Debug"
! # Begin Group "Source Files"
! 
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
! 
! SOURCE=.\calib_dist.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\calib_inp.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\main.c
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl"
! # Begin Source File
! 
! SOURCE=.\calib_camera.h
! # End Source File
! # End Group
! # Begin Group "Resource Files"
! 
! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
! # End Group
! # End Target
! # End Project

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.c	1 Sep 2005 01:07:58 -0000	1.6
--- main.c	14 Sep 2005 19:11:03 -0000	1.7
***************
*** 50,54 ****
  // ============================================================================

! #define CALIB_CAMERA2_DEBUG 1

  // ============================================================================
--- 50,54 ----
  // ============================================================================

! #define CALIB_CAMERA2_DEBUG 0

  // ============================================================================
***************
*** 91,95 ****
  static unsigned char   *gClipImage = NULL;

! static CALIB_PATT_T    gPatt = {0};          
  static double          dist_factor[4];
  static double          mat[3][4];
--- 91,95 ----
  static unsigned char   *gClipImage = NULL;

! static CALIB_PATT_T    gPatt;          
  static double          dist_factor[4];
  static double          mat[3][4];
***************
*** 640,681 ****
      i = check_num;

!     for( j = 0; j < gPatt.v_num; j++ ) {
!         for( k = 0; k < gPatt.h_num; k++ ) {
              x[k] = gPatt.point[i][j*gPatt.h_num+k].x_coord;
              y[k] = gPatt.point[i][j*gPatt.h_num+k].y_coord;
          }
!         draw_line2( x, y, gPatt.h_num );
      }

!     for( j = 0; j < gPatt.h_num; j++ ) {
!         for( k = 0; k < gPatt.v_num; k++ ) {
              x[k] = gPatt.point[i][k*gPatt.h_num+j].x_coord;
              y[k] = gPatt.point[i][k*gPatt.h_num+j].y_coord;
          }
!         draw_line2( x, y, gPatt.v_num );
      }

!     for( j = 3 - gPatt.v_num; j < gPatt.h_num - 2; j++ ) {
          p = 0;
!         for( k = 0; k < gPatt.v_num; k++ ) {
              l = j+k;
!             if( l < 0 || l >= gPatt.h_num ) continue;
              x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord;
              y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord;
              p++;
          }
!         draw_line2( x, y, p );
      }

!     for( j = 2; j < gPatt.h_num + gPatt.v_num - 3; j++ ) {
          p = 0;
!         for( k = 0; k < gPatt.v_num; k++ ) {
              l = j-k;
!             if( l < 0 || l >= gPatt.h_num ) continue;
              x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord;
              y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord;
              p++;
          }
!         draw_line2( x, y, p );
      }

--- 640,681 ----
      i = check_num;

!     for (j = 0; j < gPatt.v_num; j++) {
!         for (k = 0; k < gPatt.h_num; k++) {
              x[k] = gPatt.point[i][j*gPatt.h_num+k].x_coord;
              y[k] = gPatt.point[i][j*gPatt.h_num+k].y_coord;
          }
!         draw_line2(x, y, gPatt.h_num);
      }

!     for (j = 0; j < gPatt.h_num; j++) {
!         for (k = 0; k < gPatt.v_num; k++) {
              x[k] = gPatt.point[i][k*gPatt.h_num+j].x_coord;
              y[k] = gPatt.point[i][k*gPatt.h_num+j].y_coord;
          }
!         draw_line2(x, y, gPatt.v_num);
      }

!     for (j = 3 - gPatt.v_num; j < gPatt.h_num - 2; j++) {
          p = 0;
!         for (k = 0; k < gPatt.v_num; k++) {
              l = j+k;
!             if (l < 0 || l >= gPatt.h_num) continue;
              x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord;
              y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord;
              p++;
          }
!         draw_line2(x, y, p);
      }

!     for (j = 2; j < gPatt.h_num + gPatt.v_num - 3; j++) {
          p = 0;
!         for (k = 0; k < gPatt.v_num; k++) {
              l = j-k;
!             if (l < 0 || l >= gPatt.h_num) continue;
              x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord;
              y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord;
              p++;
          }
!         draw_line2(x, y, p);
      }

Index: calib_camera.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** calib_camera.h	1 Sep 2005 01:07:58 -0000	1.3
--- calib_camera.h	14 Sep 2005 19:11:03 -0000	1.4
***************
*** 1,4 ****
! #ifndef CALIB_DIST_H
! #define CALIB_DIST_H

  #include <AR/gsub_lite.h>
--- 1,4 ----
! #ifndef CALIB_CAMERA_H
! #define CALIB_CAMERA_H

  #include <AR/gsub_lite.h>
***************
*** 27,29 ****
  int  calc_inp( CALIB_PATT_T *patt, double dist_factor[4], int xsize, int ysize, double mat[3][4] );

! #endif // CALIB_DIST_H
--- 27,29 ----
  int  calc_inp( CALIB_PATT_T *patt, double dist_factor[4], int xsize, int ysize, double mat[3][4] );

! #endif // CALIB_CAMERA_H

[artoolkit-commits] artoolkit/util/calib_camera2 calib_camera.h,1.3,1.4 Makefile.in,1.1.1.1,1.2 main

Optical marker tracking and overlay for augmented reality.

[artoolkit-commits] artoolkit/util/calib_camera2 calib_camera.h,1.3,1.4 Makefile.in,1.1.1.1,1.2 main.c,1.6,1.7 calib_camera2.dsp,1.1.1.1,1.2 calib_camera2.vcproj,1.2,1.3