[artoolkit-commits] artoolkit/util/calib_distortion calib_dist.c,1.8,1.9 calib_dist.h,1.1.1.1,1.2 ca

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	calib_dist.c calib_dist.h calib_distortion.dsp 
	calib_dist.vcproj Makefile.in 
Log Message:
Step 2 of cleanup.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/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:13 -0000	1.1.1.1
--- Makefile.in	14 Sep 2005 19:11:17 -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_dist.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calib_dist.vcproj	23 Jul 2005 00:01:32 -0000	1.2
--- calib_dist.vcproj	14 Sep 2005 19:11:16 -0000	1.3
***************
*** 1,123 ****
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="calib_dist"
! 	ProjectGUID="{0304C918-FB5D-5047-11BF-7DCB5020DFF4}">
! 	<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_dist.c">
! 		</File>
! 		<File
! 			RelativePath="calib_dist.h">
! 		</File>
! 		<File
! 			RelativePath="check_dist.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>
--- 1,123 ----
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="calib_dist"
! 	ProjectGUID="{0304C918-FB5D-5047-11BF-7DCB5020DFF4}">
! 	<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_dist.c">
! 		</File>
! 		<File
! 			RelativePath="calib_dist.h">
! 		</File>
! 		<File
! 			RelativePath="check_dist.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>

Index: calib_dist.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** calib_dist.h	4 Nov 2004 08:52:12 -0000	1.1.1.1
--- calib_dist.h	14 Sep 2005 19:11:16 -0000	1.2
***************
*** 2,5 ****
--- 2,7 ----
  #define CALIB_DIST_H

+ #include <AR/gsub_lite.h>
+ 
  #define  THRESH     150
  #define  H_NUM        6
***************
*** 14,21 ****
  typedef struct patt {
      unsigned char  *savedImage[LOOP_MAX];
      CALIB_COORD_T  *point[LOOP_MAX];
!     int            h_num;
!     int            v_num;
!     int            loop_num;
  } CALIB_PATT_T;

--- 16,24 ----
  typedef struct patt {
      unsigned char  *savedImage[LOOP_MAX];
+ 	ARGL_CONTEXT_SETTINGS_REF arglSettings[LOOP_MAX];
      CALIB_COORD_T  *point[LOOP_MAX];
!     int            h_num;				// Number of dots horizontally in the calibration pattern.
!     int            v_num;				// Number of dots vertically in the calibration pattern.
!     int            loop_num;			// How many images of the complete calibration patterns we have completed.
  } CALIB_PATT_T;

Index: calib_distortion.dsp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_distortion.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** calib_distortion.dsp	4 Nov 2004 08:52:13 -0000	1.1.1.1
--- calib_distortion.dsp	14 Sep 2005 19:11:16 -0000	1.2
***************
*** 1,114 ****
! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
! 
! CFG=calib_distortion - 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_distortion.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_distortion.mak" CFG="calib_distortion - Win32 Debug"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "calib_distortion - 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_distortion - 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 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 /nodefaultlib:"libc.lib" /out:"../../bin/calib_distortion.exe" /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ELSEIF  "$(CFG)" == "calib_distortion - 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 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 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "calib_distortion - Win32 Release"
! # Name "calib_distortion - 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=.\check_dist.c
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl"
! # Begin Source File
! 
! SOURCE=.\calib_dist.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,114 ----
! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
! 
! CFG=calib_distortion - 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_distortion.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_distortion.mak" CFG="calib_distortion - Win32 Debug"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "calib_distortion - 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_distortion - 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 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 /nodefaultlib:"libc.lib" /out:"../../bin/calib_distortion.exe" /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ELSEIF  "$(CFG)" == "calib_distortion - 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 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 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib"
! # SUBTRACT LINK32 /nodefaultlib
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "calib_distortion - Win32 Release"
! # Name "calib_distortion - 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=.\check_dist.c
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl"
! # Begin Source File
! 
! SOURCE=.\calib_dist.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: calib_dist.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** calib_dist.c	31 Aug 2005 00:05:18 -0000	1.8
--- calib_dist.c	14 Sep 2005 19:11:16 -0000	1.9
***************
*** 1,4 ****
  #ifdef _WIN32
! #include <windows.h>
  #endif
  #include <math.h>
--- 1,28 ----
+ /*
+  * 
+  * This file is part of ARToolKit.
+  * 
+  * ARToolKit is free software; you can redistribute it and/or modify
[...1464 lines suppressed...]
! 			printf("Press mouse button to grab first image,\n");
! 			printf("or press [esc] to quit.\n");
! 			break;
          case 1:
! 			printf("Press mouse button and drag mouse to rubber-bound features (%d x %d),\n", gPatt.h_num, gPatt.v_num);
! 			printf("or press [esc] to cancel rubber-bounding & retry grabbing.\n");
! 			break;
          case 2:
! 			printf("Press mouse button to save feature positions,\n");
! 			printf("or press [esc] to discard feature positions & retry grabbing.\n");
! 			break;
          case 4:
! 			printf("Press mouse button to grab next image,\n");
! 			printf("or press [esc] to calculate distortion parameter.\n");
! 			break;
          case 5:
! 			printf("Press [esc] to calculate distortion parameter.\n");
! 			break;
      }
  }

[artoolkit-commits] artoolkit/util/calib_distortion calib_dist.c,1.8,1.9 calib_dist.h,1.1.1.1,1.2 ca

Optical marker tracking and overlay for augmented reality.

[artoolkit-commits] artoolkit/util/calib_distortion calib_dist.c,1.8,1.9 calib_dist.h,1.1.1.1,1.2 calib_distortion.dsp,1.1.1.1,1.2 calib_dist.vcproj,1.2,1.3 Makefile.in,1.1.1.1,1.2