artoolkit-commits Mailing List for ARToolKit (Page 20)
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits — Log of code commits to the ARToolKit repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(5) |
Mar
(15) |
Apr
(22) |
May
|
Jun
(9) |
Jul
(108) |
Aug
(42) |
Sep
(62) |
Oct
(5) |
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(27) |
Jun
(58) |
Jul
(8) |
Aug
(11) |
Sep
(51) |
Oct
(15) |
Nov
(12) |
Dec
(3) |
| 2007 |
Jan
(25) |
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(20) |
Sep
(5) |
Oct
|
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Philip L. <phi...@us...> - 2005-07-28 21:57:49
|
Update of /cvsroot/artoolkit/artoolkit/examples/multi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13854 Modified Files: multiTest.c Log Message: Adjust Windows vconf. Index: multiTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/multi/multiTest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** multiTest.c 22 Jul 2005 23:59:25 -0000 1.4 --- multiTest.c 28 Jul 2005 21:57:40 -0000 1.5 *************** *** 17,29 **** #include <AR/arMulti.h> ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! /*****************************************************************************/ int xsize, ysize; int thresh = 100; --- 17,28 ---- #include <AR/arMulti.h> ! /* set up the video format globals */ #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! int xsize, ysize; int thresh = 100; |
|
From: Philip L. <phi...@us...> - 2005-07-28 21:57:45
|
Update of /cvsroot/artoolkit/artoolkit/examples/paddleInteraction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13826 Modified Files: paddleInteractionTest.c Log Message: Adjust Windows vconf. Index: paddleInteractionTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/paddleInteraction/paddleInteractionTest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** paddleInteractionTest.c 22 Jul 2005 23:59:20 -0000 1.5 --- paddleInteractionTest.c 28 Jul 2005 21:57:36 -0000 1.6 *************** *** 25,38 **** #include "paddle.h" ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; #endif - /*****************************************************************************/ - /* define a target struct for the objects that are to be touched */ --- 25,35 ---- #include "paddle.h" ! /* set up the video format globals */ #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else char *vconf = ""; #endif /* define a target struct for the objects that are to be touched */ |
|
From: Philip L. <phi...@us...> - 2005-07-28 20:31:17
|
Update of /cvsroot/artoolkit/artoolkit/examples/relation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25063 Modified Files: relationTest.c Log Message: Adjust Windows vconf. Index: relationTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/relation/relationTest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** relationTest.c 23 Jul 2005 00:00:16 -0000 1.5 --- relationTest.c 28 Jul 2005 20:31:09 -0000 1.6 *************** *** 37,49 **** }; ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! /*****************************************************************************/ int xsize, ysize; int thresh = 100; --- 37,48 ---- }; ! /* set up the video format globals */ #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! int xsize, ysize; int thresh = 100; |
|
From: Philip L. <phi...@us...> - 2005-07-28 20:31:13
|
Update of /cvsroot/artoolkit/artoolkit/examples/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25037 Modified Files: simpleTest.c Log Message: Adjust Windows vconf. Index: simpleTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** simpleTest.c 22 Jul 2005 23:59:11 -0000 1.4 --- simpleTest.c 28 Jul 2005 20:31:04 -0000 1.5 *************** *** 16,28 **** #include <AR/ar.h> ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; #endif - /*****************************************************************************/ int xsize, ysize; --- 16,26 ---- #include <AR/ar.h> ! /* set up the video format globals */ #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else char *vconf = ""; #endif int xsize, ysize; |
|
From: Philip L. <phi...@us...> - 2005-07-28 20:31:08
|
Update of /cvsroot/artoolkit/artoolkit/examples/optical In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24997 Modified Files: optical.c Log Message: Adjust Windows vconf. Index: optical.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/optical/optical.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** optical.c 22 Jul 2005 23:59:15 -0000 1.4 --- optical.c 28 Jul 2005 20:31:00 -0000 1.5 *************** *** 23,35 **** /* set up the video format globals */ - /*****************************************************************************/ - // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! /*****************************************************************************/ int xsize; int ysize; --- 23,33 ---- /* set up the video format globals */ #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else char *vconf = ""; #endif ! int xsize; int ysize; |
|
From: Philip L. <phi...@us...> - 2005-07-28 20:30:22
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24840 Modified Files: simpleLite.c Log Message: Adjust Windows vconf. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** simpleLite.c 27 Jul 2005 00:29:48 -0000 1.5 --- simpleLite.c 28 Jul 2005 20:30:13 -0000 1.6 *************** *** 161,165 **** // Find the size of the window. if (arVideoInqSize(&xsize, &ysize) < 0) return (FALSE); ! fprintf(stderr, "demoARSetupCamera(): Camera image size (x,y) = (%d,%d)\n", xsize, ysize); // Load the camera parameters, resize for the window and init. --- 161,165 ---- // Find the size of the window. if (arVideoInqSize(&xsize, &ysize) < 0) return (FALSE); ! fprintf(stdout, "Camera image size (x,y) = (%d,%d)\n", xsize, ysize); // Load the camera parameters, resize for the window and init. *************** *** 170,174 **** arParamChangeSize(&wparam, xsize, ysize, &gARTCparam); arInitCparam(&gARTCparam); ! fprintf(stderr, "*** Camera Parameter ***\n"); arParamDisp(&gARTCparam); --- 170,174 ---- arParamChangeSize(&wparam, xsize, ysize, &gARTCparam); arInitCparam(&gARTCparam); ! fprintf(stdout, "*** Camera Parameter ***\n"); arParamDisp(&gARTCparam); *************** *** 420,424 **** char *vconf = // Camera configuration. #if defined(_WIN32) ! "WDM_camera_flipV.xml"; #elif defined(__APPLE__) ""; --- 420,424 ---- char *vconf = // Camera configuration. #if defined(_WIN32) ! "Data\\WDM_camera_flipV.xml"; #elif defined(__APPLE__) ""; |
|
From: Philip L. <phi...@us...> - 2005-07-28 20:17:55
|
Update of /cvsroot/artoolkit/artoolkit/bin/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21940 Added Files: WDM_camera_flipV.xml WDM_camera.xml Log Message: We will supply camera config files for Windows video library. --- NEW FILE: WDM_camera_flipV.xml --- <?xml version="1.0" encoding="UTF-8"?> <!--Sample XML file generated by XMLSpy v2005 rel. 3 U (http://www.altova.com)--> <dsvl_input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\Thomas\My Documents\projects\ARToolKit & DSVideoLib\ARVideoLib\DsVideoLib\DsVideoLib.xsd"> <camera show_format_dialog="true" friendly_name="PGR"> <pixel_format> <RGB32 flip_h="false" flip_v="true"/> </pixel_format> </camera> </dsvl_input> --- NEW FILE: WDM_camera.xml --- <?xml version="1.0" encoding="UTF-8"?> <!--Sample XML file generated by XMLSpy v2005 rel. 3 U (http://www.altova.com)--> <dsvl_input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\Thomas\My Documents\projects\ARToolKit & DSVideoLib\ARVideoLib\DsVideoLib\DsVideoLib.xsd"> <camera show_format_dialog="true" friendly_name="PGR"> <pixel_format> <RGB32/> </pixel_format> </camera> </dsvl_input> |
|
From: Philip L. <phi...@us...> - 2005-07-28 00:00:53
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18134 Modified Files: param.h Log Message: Spelling correction. Index: param.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/param.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** param.h 25 Nov 2004 23:24:20 -0000 1.4 --- param.h 28 Jul 2005 00:00:40 -0000 1.5 *************** *** 184,188 **** * * Load camera intrinsic parameters in the ARToolkit Library from ! * a file (itselft, a resulted output of calibration step). * \param filename name of the parameters file. * \param num number of variable arguments --- 184,188 ---- * * Load camera intrinsic parameters in the ARToolkit Library from ! * a file (itself, an output of the calibration step). * \param filename name of the parameters file. * \param num number of variable arguments |
|
From: Philip L. <phi...@us...> - 2005-07-27 21:21:40
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11718 Modified Files: video.c Log Message: Apply patch by Wayne Piekarski to auto-adjust video resolution. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** video.c 22 Nov 2004 02:32:40 -0000 1.2 --- video.c 27 Jul 2005 21:21:24 -0000 1.3 *************** *** 1,6 **** /* * Video capture subrutine for Linux/Video4Linux devices * author: Nakazawa,Atsushi ( nak...@in... ) ! Hirokazu Kato ( ka...@sy... ) * * Revision: 5.3 Date: 2004/11/18 --- 1,10 ---- /* + * Revision: 5.2 Date: 2000/08/25 * Video capture subrutine for Linux/Video4Linux devices * author: Nakazawa,Atsushi ( nak...@in... ) ! * Hirokazu Kato ( ka...@sy... ) ! * ! * Modified by Wayne Piekarski (wa...@ti...) - 2005/03/29 ! * Added support to automatically adjust camera parameters if needed * * Revision: 5.3 Date: 2004/11/18 *************** *** 111,114 **** --- 115,120 ---- printf(" -channel=N\n"); printf(" specifies source channel.\n"); + printf(" -noadjust\n"); + printf(" prevent adjusting the width/height/channel if not suitable.\n"); printf(" -width=N\n"); printf(" specifies expected width of image.\n"); *************** *** 146,150 **** char *a, line[256]; int i; ! arMalloc( vid, AR2VideoParamT, 1 ); strcpy( vid->dev, DEFAULT_VIDEO_DEVICE ); --- 152,157 ---- char *a, line[256]; int i; ! int adjust = 1; ! arMalloc( vid, AR2VideoParamT, 1 ); strcpy( vid->dev, DEFAULT_VIDEO_DEVICE ); *************** *** 215,218 **** --- 222,228 ---- } } + else if( strncmp ( a, "-noadjust", 9 ) == 0 ) { + adjust = 0; + } else if( strncmp( a, "-contrast=", 10 ) == 0 ) { sscanf( a, "%s", line ); *************** *** 309,312 **** --- 319,333 ---- } + /* adjust capture size if needed */ + if (adjust) + { + if (vid->width >= vd.maxwidth) + vid->width = vd.maxwidth; + if (vid->height >= vd.maxheight) + vid->height = vd.maxheight; + if (vid->debug) + printf ("arVideoOpen: width/height adjusted to (%d, %d)\n", vid->width, vid->height); + } + /* check capture size */ if(vd.maxwidth < vid->width || vid->width < vd.minwidth || *************** *** 316,320 **** return 0; } ! /* check channel */ if(vid->channel < 0 || vid->channel >= vd.channels){ --- 337,350 ---- return 0; } ! ! /* adjust channel if needed */ ! if (adjust) ! { ! if (vid->channel >= vd.channels) ! vid->channel = 0; ! if (vid->debug) ! printf ("arVideoOpen: channel adjusted to 0\n"); ! } ! /* check channel */ if(vid->channel < 0 || vid->channel >= vd.channels){ |
|
From: Philip L. <phi...@us...> - 2005-07-27 00:30:00
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25526 Modified Files: twoView.c Log Message: Fix Windows vconf string. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** twoView.c 10 Mar 2005 03:58:16 -0000 1.6 --- twoView.c 27 Jul 2005 00:29:52 -0000 1.7 *************** *** 547,552 **** char *vconfs[] = { // Camera configuration. #if defined(_WIN32) ! "showDlg,flipV", ! "showDlg,flipV", #elif defined(__APPLE__) "", --- 547,552 ---- char *vconfs[] = { // Camera configuration. #if defined(_WIN32) ! "WDM_camera_flipV.xml", ! "WDM_camera_flipV.xml", #elif defined(__APPLE__) "", *************** *** 554,558 **** #else "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240", ! "-dev=/dev/video3 -channel=0 -palette=YUV420P -width=320 -height=240", #endif }; --- 554,558 ---- #else "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240", ! "-dev=/dev/video1 -channel=0 -palette=YUV420P -width=320 -height=240", #endif }; |
|
From: Philip L. <phi...@us...> - 2005-07-27 00:29:57
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25490 Modified Files: simpleLite.c Log Message: Fix Windows vconf string. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** simpleLite.c 18 Feb 2005 04:18:43 -0000 1.4 --- simpleLite.c 27 Jul 2005 00:29:48 -0000 1.5 *************** *** 420,424 **** char *vconf = // Camera configuration. #if defined(_WIN32) ! "showDlg,flipV"; #elif defined(__APPLE__) ""; --- 420,424 ---- char *vconf = // Camera configuration. #if defined(_WIN32) ! "WDM_camera_flipV.xml"; #elif defined(__APPLE__) ""; |
|
From: Philip L. <phi...@us...> - 2005-07-27 00:29:53
|
Update of /cvsroot/artoolkit/artoolkit/examples/paddleDemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25458 Modified Files: paddleDemo.c Log Message: Fix Windows vconf string. Index: paddleDemo.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/paddleDemo/paddleDemo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** paddleDemo.c 20 Jul 2005 22:32:05 -0000 1.4 --- paddleDemo.c 27 Jul 2005 00:29:44 -0000 1.5 *************** *** 24,28 **** #ifdef _WIN32 ! char *vconf = "showDlg,flipV"; // see video.h for a list of supported parameters #else char *vconf = ""; --- 24,28 ---- #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; // see video.h for a list of supported parameters #else char *vconf = ""; |
|
From: Philip L. <phi...@us...> - 2005-07-27 00:29:49
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25442 Modified Files: simpleVRML.c Log Message: Fix Windows vconf string. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** simpleVRML.c 18 Feb 2005 04:18:30 -0000 1.3 --- simpleVRML.c 27 Jul 2005 00:29:40 -0000 1.4 *************** *** 403,407 **** char *vconf = // Camera configuration. #if defined(_WIN32) ! "showDlg,flipV"; #elif defined(__APPLE__) ""; --- 403,407 ---- char *vconf = // Camera configuration. #if defined(_WIN32) ! "WDM_camera_flipV.xml"; #elif defined(__APPLE__) ""; |
|
From: Philip L. <phi...@us...> - 2005-07-27 00:29:46
|
Update of /cvsroot/artoolkit/artoolkit/examples/exview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25399 Modified Files: exview.c Log Message: Fix Windows vconf string. Index: exview.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/exview/exview.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exview.c 20 Jul 2005 22:41:28 -0000 1.4 --- exview.c 27 Jul 2005 00:29:28 -0000 1.5 *************** *** 25,29 **** #ifdef _WIN32 ! char *vconf = "showDlg,flipV"; // see video.h for a list of supported parameters #else char *vconf = ""; --- 25,29 ---- #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; // see video.h for a list of supported parameters #else char *vconf = ""; |
|
From: Philip L. <phi...@us...> - 2005-07-26 17:50:09
|
Update of /cvsroot/artoolkit/artoolkit/util/graphicsTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25436 Modified Files: graphicsTest.vcproj Log Message: Tidy up more paths. Index: graphicsTest.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/graphicsTest/graphicsTest.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** graphicsTest.vcproj 22 Jul 2005 23:59:29 -0000 1.2 --- graphicsTest.vcproj 26 Jul 2005 17:50:00 -0000 1.3 *************** *** 1,117 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="graphicsTest" ! ProjectGUID="{8C93A102-ABC7-4848-A183-BD1F3471159C}"> ! <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="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! 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 libARgsub.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <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="graphicsTest.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,118 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="graphicsTest" ! ProjectGUID="{8C93A102-ABC7-4848-A183-BD1F3471159C}"> ! <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="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib"" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"/> ! <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 libARgsub.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib""/> ! <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="graphicsTest.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2005-07-26 17:49:44
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25317 Modified Files: libARvideo.vcproj Log Message: Tidy up more paths. Index: libARvideo.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/libARvideo.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libARvideo.vcproj 23 Jul 2005 00:01:38 -0000 1.2 --- libARvideo.vcproj 26 Jul 2005 17:49:19 -0000 1.3 *************** *** 1,117 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="libARvideo" ! ProjectGUID="{B5E62882-360E-46B2-A97F-50443BB795E3}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="2" ! CharacterSet="0"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories=""$(ProjectDir)../../../include";"$(ProjectDir)../../../DSVL/src"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! BrowseInformation="1" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="DSVLd.lib comsupp.lib" ! OutputFile="$(ProjectDir)../../../bin/$(ProjectName)d.dll" ! LinkIncremental="0" ! AdditionalLibraryDirectories=""$(ProjectDir)../../../DSVL/lib/"" ! GenerateDebugInformation="TRUE" ! ImportLibrary="$(ProjectDir)..\..\$(ProjectName)d.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <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="2" ! CharacterSet="0"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=""$(ProjectDir)../../../include";"$(ProjectDir)../../../DSVL/src"" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" ! RuntimeLibrary="2"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="DSVL.lib comsupp.lib" ! OutputFile="$(ProjectDir)../../../bin/$(ProjectName).dll" ! AdditionalLibraryDirectories=""$(ProjectDir)../../../DSVL/lib/"" ! ImportLibrary="$(ProjectDir)..\..\$(ProjectName).lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <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> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> ! <File ! RelativePath=".\videoWin32DirectShow.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,118 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="libARvideo" ! ProjectGUID="{B5E62882-360E-46B2-A97F-50443BB795E3}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="2" ! CharacterSet="0"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\include";"$(ProjectDir)..\..\..\DSVL\src"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! BrowseInformation="1" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="DSVLd.lib comsupp.lib" ! OutputFile="$(ProjectDir)..\..\..\bin\$(ProjectName)d.dll" ! LinkIncremental="0" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\DSVL\lib\"" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" ! ImportLibrary="$(ProjectDir)..\..\$(ProjectName)d.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <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="2" ! CharacterSet="0"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\include";"$(ProjectDir)..\..\..\DSVL\src"" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" ! RuntimeLibrary="2"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="DSVL.lib comsupp.lib" ! OutputFile="$(ProjectDir)..\..\..\bin\$(ProjectName).dll" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\DSVL\lib\"" ! ImportLibrary="$(ProjectDir)..\..\$(ProjectName).lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <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> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> ! <File ! RelativePath=".\videoWin32DirectShow.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:42
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22271 Modified Files: calib_camera2.vcproj main.c Log Message: Merge DSVideoLib-0.0.8b. Index: calib_camera2.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calib_camera2.vcproj 22 Nov 2004 02:49:02 -0000 1.1 --- calib_camera2.vcproj 23 Jul 2005 00:02:32 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 31,36 **** AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" GenerateDebugInformation="TRUE"/> <Tool --- 31,36 ---- AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" GenerateDebugInformation="TRUE"/> <Tool *************** *** 70,74 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 70,74 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> *************** *** 78,83 **** Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> <Tool Name="VCMIDLTool" --- 78,83 ---- Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> <Tool Name="VCMIDLTool" Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 20 Jul 2005 22:38:59 -0000 1.3 --- main.c 23 Jul 2005 00:02:32 -0000 1.4 *************** *** 53,57 **** # endif #elif defined(_WIN32) ! char *vconf = "flipV,showDlg"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; --- 53,57 ---- # endif #elif defined(_WIN32) ! char *vconf = "WDM_camera_flipV.xml"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:31
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/ARMulti In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22251 Modified Files: libARMulti.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: libARMulti.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARMulti/libARMulti.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARMulti.vcproj 4 Nov 2004 08:51:34 -0000 1.1.1.1 --- libARMulti.vcproj 23 Jul 2005 00:02:21 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 60,64 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 60,64 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:27
|
Update of /cvsroot/artoolkit/artoolkit/examples/collide In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22218 Modified Files: collideTest.c collideTest.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: collideTest.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/collide/collideTest.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** collideTest.vcproj 22 Nov 2004 03:37:51 -0000 1.1 --- collideTest.vcproj 23 Jul 2005 00:02:16 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 30,36 **** Name="VCLinkerTool" AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" GenerateDebugInformation="TRUE"/> <Tool --- 30,36 ---- Name="VCLinkerTool" AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" GenerateDebugInformation="TRUE"/> <Tool *************** *** 70,74 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 70,74 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> *************** *** 77,83 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> <Tool Name="VCMIDLTool" --- 77,83 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> <Tool Name="VCMIDLTool" Index: collideTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/collide/collideTest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** collideTest.c 20 Jul 2005 22:41:08 -0000 1.4 --- collideTest.c 23 Jul 2005 00:02:16 -0000 1.5 *************** *** 33,37 **** /* set video capture configuration */ #ifdef _WIN32 ! char *vconf = "flipV,showDlg"; // see video.h for a list of supported parameters #else char *vconf = ""; --- 33,37 ---- /* set video capture configuration */ #ifdef _WIN32 ! char *vconf = "WDM_camera_flipV.xml"; #else char *vconf = ""; |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:22
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22177 Modified Files: libARgsub.vcproj libARgsub_lite.vcproj libARgsubUtil.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: libARgsub_lite.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/libARgsub_lite.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARgsub_lite.vcproj 4 Nov 2004 08:51:43 -0000 1.1.1.1 --- libARgsub_lite.vcproj 23 Jul 2005 00:02:11 -0000 1.2 *************** *** 20,24 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="FALSE" --- 20,24 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="FALSE" *************** *** 60,64 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="0"/> --- 60,64 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="0"/> Index: libARgsubUtil.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/libARgsubUtil.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARgsubUtil.vcproj 4 Nov 2004 08:51:43 -0000 1.1.1.1 --- libARgsubUtil.vcproj 23 Jul 2005 00:02:11 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 60,64 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 60,64 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> Index: libARgsub.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/libARgsub.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARgsub.vcproj 4 Nov 2004 08:51:43 -0000 1.1.1.1 --- libARgsub.vcproj 23 Jul 2005 00:02:11 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 60,64 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 60,64 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:15
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22141 Modified Files: simpleVRML.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: simpleVRML.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** simpleVRML.vcproj 1 Dec 2004 19:56:19 -0000 1.2 --- simpleVRML.vcproj 23 Jul 2005 00:02:06 -0000 1.3 *************** *** 20,24 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include;$(ProjectDir)/../../OpenVRML/include;$(ProjectDir)/../../OpenVRML/dependencies/include;$(NOINHERIT)" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENVRML_ENABLE_IMAGETEXTURE_NODE;OPENVRML_ENABLE_GZIP" MinimalRebuild="TRUE" --- 20,24 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../OpenVRML/include;$(ProjectDir)../../OpenVRML/dependencies/include;$(NOINHERIT)" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENVRML_ENABLE_IMAGETEXTURE_NODE;OPENVRML_ENABLE_GZIP" MinimalRebuild="TRUE" *************** *** 38,43 **** Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib glut32.lib libjpeg.lib libpng.lib zlib.lib libarvrmld.lib openvrml.lib openvrml-gl.lib antlr.lib regex.lib libARvideod.lib libARd.lib libARgsub_lited.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories="$(ProjectDir)/../../lib;$(ProjectDir)/../../OpenVRML/lib;$(ProjectDir)/../../OpenVRML/dependencies/lib" IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib;libcmtd.lib;msvcrt.lib" SubSystem="1" --- 38,43 ---- Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib glut32.lib libjpeg.lib libpng.lib zlib.lib libarvrmld.lib openvrml.lib openvrml-gl.lib antlr.lib regex.lib libARvideod.lib libARd.lib libARgsub_lited.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories="$(ProjectDir)../../lib;$(ProjectDir)../../OpenVRML/lib;$(ProjectDir)../../OpenVRML/dependencies/lib" IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib;libcmtd.lib;msvcrt.lib" SubSystem="1" *************** *** 72,76 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include;$(ProjectDir)/../../OpenVRML/include;$(ProjectDir)/../../OpenVRML/dependencies/include;$(NOINHERIT)" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" --- 72,76 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../OpenVRML/include;$(ProjectDir)../../OpenVRML/dependencies/include;$(NOINHERIT)" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" *************** *** 82,88 **** Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib glut32.lib libjpeg.lib libpng.lib zlib.lib libARvrml.lib openvrml.lib openvrml-gl.lib antlr.lib regex.lib libARvideo.lib libAR.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" LinkIncremental="1" ! AdditionalLibraryDirectories="$(ProjectDir)/../../lib;$(ProjectDir)/../../OpenVRML/lib;$(ProjectDir)/../../OpenVRML/dependencies/lib" IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib,libcmt.lib;msvcrtd.lib" SubSystem="1" --- 82,88 ---- Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib glut32.lib libjpeg.lib libpng.lib zlib.lib libARvrml.lib openvrml.lib openvrml-gl.lib antlr.lib regex.lib libARvideo.lib libAR.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" LinkIncremental="1" ! AdditionalLibraryDirectories="$(ProjectDir)../../lib;$(ProjectDir)../../OpenVRML/lib;$(ProjectDir)../../OpenVRML/dependencies/lib" IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib,libcmt.lib;msvcrtd.lib" SubSystem="1" |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:13
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22102 Modified Files: libAR.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: libAR.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/libAR.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libAR.vcproj 4 Nov 2004 08:51:27 -0000 1.1.1.1 --- libAR.vcproj 23 Jul 2005 00:02:01 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 60,64 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 60,64 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="$(ProjectDir)../../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:02:05
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22037 Modified Files: mk_patt.c mk_patt.vcproj Log Message: Merge DSVideoLib-0.0.8b. Index: mk_patt.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mk_patt.c 20 Jul 2005 22:41:33 -0000 1.3 --- mk_patt.c 23 Jul 2005 00:01:56 -0000 1.4 *************** *** 31,35 **** # endif #elif defined(_WIN32) ! char *vconf = "flipV,showDlg"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; --- 31,35 ---- # endif #elif defined(_WIN32) ! char *vconf = "WDM_camera_flipV.xml"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; Index: mk_patt.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mk_patt.vcproj 4 Nov 2004 08:52:15 -0000 1.1.1.1 --- mk_patt.vcproj 23 Jul 2005 00:01:56 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 31,36 **** AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" GenerateDebugInformation="TRUE"/> <Tool --- 31,36 ---- AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" GenerateDebugInformation="TRUE"/> <Tool *************** *** 70,74 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 70,74 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> *************** *** 78,83 **** Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> <Tool Name="VCMIDLTool" --- 78,83 ---- Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> <Tool Name="VCMIDLTool" |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:01:49
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22005 Modified Files: videoWin32DirectShow.cpp libARvideo.vcproj libARvideo.dsp Log Message: Merge DSVideoLib-0.0.8b. Index: libARvideo.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/libARvideo.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARvideo.dsp 4 Nov 2004 08:51:57 -0000 1.1.1.1 --- libARvideo.dsp 23 Jul 2005 00:01:38 -0000 1.2 *************** *** 26,30 **** # PROP Scc_ProjName "" # PROP Scc_LocalPath "" ! CPP=cl.exe MTL=midl.exe RSC=rc.exe --- 26,30 ---- # PROP Scc_ProjName "" # PROP Scc_LocalPath "" ! CPP=xicl6.exe MTL=midl.exe RSC=rc.exe *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\DSVideoLib\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\DSVL\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 53,59 **** # 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 /nologo /dll /machine:I386 ! # ADD LINK32 DSVideoLib.lib comsupp.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 /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\..\bin\libARvideo.dll" /implib:"..\..\..\lib\libARvideo.lib" /libpath:"..\..\..\lib" /libpath:"..\..\..\DSVideoLib\lib.vc60" # SUBTRACT LINK32 /pdb:none /nodefaultlib --- 53,59 ---- # ADD BASE BSC32 /nologo # ADD BSC32 /nologo ! LINK32=xilink6.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 /nologo /dll /machine:I386 ! # ADD LINK32 DSVL.lib comsupp.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 /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\..\bin\libARvideo.dll" /implib:"..\..\..\lib\libARvideo.lib" /libpath:"..\..\..\lib" /libpath:"..\..\..\DSVL\lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib *************** *** 72,76 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\DSVideoLib\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 72,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\DSVL\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBARVIDEO_EXPORTS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 81,87 **** # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 DSVideoLibd.lib comsupp.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 /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\..\bin\libARvideod.dll" /implib:"..\..\..\lib\libARvideod.lib" /pdbtype:sept /libpath:"..\..\..\lib" /libpath:"..\..\..\DSVideoLib\lib.vc60" # SUBTRACT LINK32 /pdb:none /nodefaultlib --- 81,87 ---- # ADD BASE BSC32 /nologo # ADD BSC32 /nologo ! LINK32=xilink6.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 /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 DSVLd.lib comsupp.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 /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\..\bin\libARvideod.dll" /implib:"..\..\..\lib\libARvideod.lib" /pdbtype:sept /libpath:"..\..\..\lib" /libpath:"..\..\..\DSVL\lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib Index: libARvideo.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/libARvideo.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libARvideo.vcproj 4 Nov 2004 08:51:57 -0000 1.1.1.1 --- libARvideo.vcproj 23 Jul 2005 00:01:38 -0000 1.2 *************** *** 20,29 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include;$(ProjectDir)/../../../DSVideoLib/src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="3" BrowseInformation="1" - WarningLevel="3" DebugInformationFormat="3"/> <Tool --- 20,28 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""$(ProjectDir)../../../include";"$(ProjectDir)../../../DSVL/src"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="3" BrowseInformation="1" DebugInformationFormat="3"/> <Tool *************** *** 31,38 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="DsVideoLibd.lib comsupp.lib" ! OutputFile="$(ProjectDir)/../../../bin/$(ProjectName)d.dll" LinkIncremental="0" ! AdditionalLibraryDirectories="$(ProjectDir)/../../../DsVideoLib/lib.vc70/" GenerateDebugInformation="TRUE" ImportLibrary="$(ProjectDir)..\..\$(ProjectName)d.lib"/> --- 30,37 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="DSVLd.lib comsupp.lib" ! OutputFile="$(ProjectDir)../../../bin/$(ProjectName)d.dll" LinkIncremental="0" ! AdditionalLibraryDirectories=""$(ProjectDir)../../../DSVL/lib/"" GenerateDebugInformation="TRUE" ImportLibrary="$(ProjectDir)..\..\$(ProjectName)d.lib"/> *************** *** 69,73 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)/../../../include;$(ProjectDir)/../../../DSVideoLib/src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" RuntimeLibrary="2"/> --- 68,72 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=""$(ProjectDir)../../../include";"$(ProjectDir)../../../DSVL/src"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBARVIDEO_EXPORTS" RuntimeLibrary="2"/> *************** *** 76,82 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="DsVideoLib.lib comsupp.lib" ! OutputFile="$(ProjectDir)/../../../bin/$(ProjectName).dll" ! AdditionalLibraryDirectories="$(ProjectDir)/../../../DsVideoLib/lib.vc70/" ImportLibrary="$(ProjectDir)..\..\$(ProjectName).lib"/> <Tool --- 75,81 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="DSVL.lib comsupp.lib" ! OutputFile="$(ProjectDir)../../../bin/$(ProjectName).dll" ! AdditionalLibraryDirectories=""$(ProjectDir)../../../DSVL/lib/"" ImportLibrary="$(ProjectDir)..\..\$(ProjectName).lib"/> <Tool Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** videoWin32DirectShow.cpp 4 Nov 2004 08:52:00 -0000 1.1.1.1 --- videoWin32DirectShow.cpp 23 Jul 2005 00:01:38 -0000 1.2 *************** *** 1,41 **** - /* ======================================================================== - * PROJECT: DirectShow Video Processing Library - * FILE: ARToolkit 2.6x WIN32/DirectShow video input - * ======================================================================== - * Author: Thomas Pintaric, Vienna University of Technology - * Contact: pin...@im... http://ims.tuwien.ac.at/~thomas - * ======================================================================= - * - * Copyright (C) 2003 Vienna University of Technology - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * For further information please contact Thomas Pintaric under - * <pin...@im...> or write to Thomas Pintaric, - * Vienna University of Technology, Favoritenstr. 9-11/188, A1040 Vienna, - * Austria. - * ========================================================================*/ /* ! * Copyright (c) 2004-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 * */ ! #include "DsVideoLib.h" ! #include <string.h> #include <AR/video.h> #include <stdlib.h> --- 1,45 ---- /* ! ======================================================================== ! PROJECT: DirectShow Video Processing Library ! Version: 0.0.8 (05/04/2005) ! ======================================================================== ! Author: Thomas Pintaric, Vienna University of Technology ! Contact: pin...@im... http://ims.tuwien.ac.at/~thomas ! ======================================================================= ! ! Copyright (C) 2005 Vienna University of Technology ! ! This library 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. ! ! This program 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 this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, ! USA. ! ! For further information please contact Thomas Pintaric under ! <pin...@im...> or write to Thomas Pintaric, ! Vienna University of Technology, Favoritenstr. 9-11/E188/2, A-1040 ! Vienna, Austria. ! ======================================================================== ! */ ! /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 + * 2.8.0 2004-07-20 PRL Incorporate DSVL-0.0.8b * */ ! #include "DSVL.h" ! //#include <string.h> #include <AR/video.h> #include <stdlib.h> *************** *** 45,49 **** struct _AR2VideoParamT { ! CGraphManager *graphManager; MemoryBufferHandle g_Handle; __int64 g_Timestamp; // deprecated, use (g_Handle.t) instead. --- 49,53 ---- struct _AR2VideoParamT { ! DSVL_VideoSource *graphManager; MemoryBufferHandle g_Handle; __int64 g_Timestamp; // deprecated, use (g_Handle.t) instead. *************** *** 133,248 **** int ar2VideoDispOption(void) { ! ! printf("parameter format is either NULL or a list of tokens, separated by commas ","\n"); ! printf("\n"); ! printf("BINARY TOKENS:\n"); ! printf("--------------\n"); ! printf("flipH : flip image horizontally (WARNING: non-optimal performance)\n"); ! printf("flipV : flip image vertically (WARNING: non-optimal performance)\n"); ! printf("showDlg : displays either WDM capture filter's property page or\n"); ! printf(" MSDV decoder format dialog (depending on source media type).\n"); ! printf(" only applies to WDM_CAP, will be ignored for AVI_FILE\n"); ! printf("loopAVI : continuously loops through an AVI file (applies only to AVI_FILE)\n"); ! printf("noClock : does not use a Reference Clock to synchronize samples;\n"); ! printf(" use this flag for offline post-processing (applies only to AVI_FILE)\n"); ! printf("renderSec : render secondary streams (applies only to AVI_FILE)\n"); ! printf(" An AVI file can contain an arbitrary number of multiplexed A/V substreams,\n"); ! printf(" usually there are at most 2 substreams (1st: video, 2nd: audio).\n"); ! printf(" the AVI_FILE input module will only try to render stream 0x00 (assuming that\n"); ! printf(" it's video) and ignore the remaning substreams.\n"); ! printf(" Use this flag to force IGraphBuilder->Render(IPin*) calls on substreams 1..n\n"); ! printf(" DO NOT SET this flag if your AVI file contains more than one video stream\n"); ! printf("\n"); ! printf("PARAMETRIZED TOKENS:\n"); ! printf("--------------------\n"); ! printf("inputDevice=? : supported parameters: \n"); ! printf(" \"WDM_CAP\" (WDM_VIDEO_CAPTURE_FILTER) use the DirectShow WDM wrapper\n"); ! printf(" to obtain live video input from a streaming capture device\n"); ! printf(" such as a IEEE 1394 DV camera or USB webcam.\n"); ! printf(" OPTIONAL: set deviceName=? and/or ieee1394id=? for better\n"); ! printf(" control over the choice of suitable WDM drivers\n"); ! printf(" \"AVI_FILE\" (ASYNC_FILE_INPUT_FILTER) use an Asynchronous File Input\n"); ! printf(" Filter to read & decode AVI video data\n"); ! printf(" NOTE: be sure to specify the input file name by pointing\n"); ! printf(" fileName=? to a valid AVI file.\n"); ! printf("\n"); ! printf(" EXAMPLE: \"inputDevive=WDM_CAP\", or \"inputDevice=AVI_FILE\"\n"); ! printf(" DEFAULT: \"WDM_CAP\" will be selected if you omit this token\n"); ! printf("\n"); ! printf("videoWidth=? : preferred video width, EXAMPLE: \"videoWidth=720\"\n"); ! printf(" only applies to WDM_CAP, will be ignored for AVI_FILE\n"); ! printf("videoHeight=? : preferred video height, EXAMPLE: \"videoHeight=576\"\n"); ! printf(" only applies to WDM_CAP, will be ignored for AVI_FILE\n"); ! printf("\n"); ! printf("pixelFormat=? : internal pixel format (see PixelFormat.h for supported types)\n"); ! printf(" PERFORMANCE WARNING: Be sure to match your IDirect3DTexture/OpenGL texture\n"); ! printf(" formats to whatever you specify here, i.e. use\n"); ! printf(" PXtoOpenGL(format), PXtoD3D(format) for creating your\n"); ! printf(" textures! (see PixelFormat.h for details)\n"); ! printf(" EXAMPLE: \"pixelFormat=PIXELFORMAT_RGB32\"\n"); ! printf(" NOTE: if you omit the pixelFormat=? token, the global\n"); ! printf(" constant (default_PIXELFORMAT, usually PIXELFORMAT_RGB32)\n"); ! printf(" will be selected.\n"); ! printf("\n"); ! printf("friendlyName=? : only applies to WDM_CAP, will be IGNORED if \"inputDevice=WDM_CAP\" is not set.\n"); ! printf(" Used to select a preferred WDM device. WILL BE IGNORED IF deviceName=? IS SET."); ! printf(" (WARNING: WDM \"friendly names\" are locale-dependent), i.e. try to match substring <?>\n"); ! printf(" with the \"friendly names\" of enumerated DirectShow WDM wrappers (ksproxy.ax).\n"); ! printf(" EXAMPLE: \"friendlyName=Microsoft DV Camera\" for IEEE1394 DV devices\n"); ! printf(" \"friendlyName=QuickCam\" for Logitech QuickCam\n"); ! printf("\n"); ! printf("deviceName=? : only applies to WDM_CAP, will be IGNORED if \"inputDevice=WDM_CAP\" is not set.\n"); ! printf(" Used to select a preferred WDM device. WILL ALWAYS WILL OVERRIDE friendlyName=?\n"); ! printf(" i.e. try to match substring <?> with the \"device names\" of enumerated DirectShow\n"); ! printf(" WDM wrappers (ksproxy.ax).\n"); ! printf(" Device names look like: \"@device:*:{860BB310-5D01-11d0-BD3B-00A0C911CE86}\n"); ! printf(" Use GraphEdit (part of the DirectX SDK, under \\DXSDK\\bin\\DxUtils\\graphedt.exe)\n"); ! printf(" to figure out your camera's device name.\n"); ! printf(" EXAMPLE: \"deviceName=1394#unibrain&fire-i_1.2#4510000061431408\n"); ! printf("\n"); ! printf("fileName=? : only applies to AVI_FILE, will be IGNORED if \"inputDevice=AVI_FILE\" is not set.\n"); ! printf(" input file name, if just use a file's name (without its full path), the WIN32\n"); ! printf(" API fuction SearchPath() (Winbase.h) will be used to locate the file.\n"); ! printf(" EXAMPLE: \"fileName=C:\\Some Directory\\Another Directory\\Video.AVI\"\n"); ! printf(" \"fileName=video.AVI\" (will succeed if C:\\Some Directory\\Another Directory\\\n"); ! printf(" is: * the application's startup directory\n"); ! printf(" * the current directory\n"); ! printf(" * listed in the PATH environment variable)\n"); ! printf("\n"); ! printf("ieee1394id=? : only applies to WDM_CAP, will be IGNORED if \"inputDevice=WDM_CAP\" is not set.\n"); ! printf(" Unique 64-bit device identifier, as defined by IEEE 1394.\n"); ! printf(" Hexadecimal value expected, i.e. \"ieee1394id=437d3b0201460008\"\n"); ! printf(" Use /bin/IEEE394_id.exe to determine your camera's ID.\n"); ! printf("\n"); ! printf("deinterlaceState=? : supported parameters (see VFX_STATE_names[])\n"); ! printf(" \"off\" : disable deinterlacing (DEFAULT)\n"); ! printf(" \"on\" : force deinterlacing (even for progressive frames) \n"); ! printf(" \"auto\" : enable deinterlacing only if \n"); ! printf(" (VIDEOINFOHEADER.dwInterlaceFlags & AMINTERLACE_IsInterlaced)\n"); ! printf(" WARNING: EXPERIMENTAL FEATURE!\n"); ! printf("\n"); ! printf("deinterlaceMethod=? : deinterlacing method (see VFxDeinterlaceParam.h for supported modes)\n"); ! printf(" supported parameters (see DEINTERLACE_METHOD_names[]):\n"); ! printf(" \"blend\" : blend fields (best quality)\n"); ! printf(" \"duplicate1\" : duplicate first field\n"); ! printf(" \"duplicate2\" : duplicate second field\n"); ! printf(" NOTE: omitting this token results in default mode (DEINTERLACE_BLEND) being used.\n"); ! printf(" WARNING: EXPERIMENTAL FEATURE!\n"); ! printf("\n"); ! printf("EXAMPLES:\n"); ! printf("\n"); ! printf("arVideoOpen(NULL);\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,showDlg\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,flipH,flipV,showDlg\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,pixelFormat=PIXELFORMAT_RGB24,showDlg\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,showDlg,deinterlaceState=on,deinterlaceMethod=duplicate1\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,videoWidth=640,flipH,videoHeight=480,showDlg,deinterlaceState=auto\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,videoWidth=720,videoHeight=480\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,friendlyName=Logitech,videoWidth=320,videoHeight=240,flipV\");\n"); ! printf("arVideoOpen(\"inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,ieee1394id=437d3b0201460008\");\n"); ! printf("arVideoOpen(\"inputDevice=AVI_FILE,fileName=C:\\Some Directory\\Another Directory\\Video.AVI\");\n"); ! printf("arVideoOpen(\"inputDevice=AVI_FILE,fileName=Video.AVI,pixelFormat=PIXELFORMAT_RGB24\");\n"); ! printf("\n"); ! return (0); } --- 137,141 ---- int ar2VideoDispOption(void) { ! printf("parameter is a file name (e.g. 'config.XML') conforming to the DSVideoLib XML Schema (DsVideoLib.xsd).\n"); return (0); } *************** *** 251,255 **** { AR2VideoParamT *vid = NULL; - DS_MEDIA_FORMAT mf; // Allocate the parameters structure and fill it in. --- 144,147 ---- *************** *** 259,270 **** CoInitialize(NULL); ! vid->graphManager = new CGraphManager(); ! ! if(FAILED(vid->graphManager->BuildGraph(config))) return(NULL); ! vid->graphManager->GetCurrentMediaFormat(&mf); ! //vid->flip_horizontal = mf.flipH; ! //vid->flip_vertical = mf.flipV; ! if(FAILED(vid->graphManager->EnableMemoryBuffer())) return(NULL); --- 151,157 ---- CoInitialize(NULL); ! vid->graphManager = new DSVL_VideoSource(); ! if(FAILED(vid->graphManager->BuildGraphFromXMLFile(config))) return(NULL); if(FAILED(vid->graphManager->EnableMemoryBuffer())) return(NULL); *************** *** 334,346 **** int ar2VideoInqSize(AR2VideoParamT *vid, int *x, int *y) { - DS_MEDIA_FORMAT mf; - if (vid == NULL) return (-1); if (vid->graphManager == NULL) return(-1); ! ! vid->graphManager->GetCurrentMediaFormat(&mf); ! *x = (int) mf.biWidth; ! *y = (int) mf.biHeight; ! return (0); } --- 221,238 ---- int ar2VideoInqSize(AR2VideoParamT *vid, int *x, int *y) { if (vid == NULL) return (-1); if (vid->graphManager == NULL) return(-1); ! ! long frame_width; ! ! long frame_height; ! ! vid->graphManager->GetCurrentMediaFormat(&frame_width, &frame_height,NULL,NULL); ! ! *x = (int) frame_width; ! ! *y = (int) frame_height; ! ! return (0); } *************** *** 350,377 **** int ar2VideoInqFlipping(AR2VideoParamT *vid, int *flipH, int *flipV) { ! DS_MEDIA_FORMAT mf; ! ! if (vid == NULL) return (-1); ! if (vid->graphManager == NULL) return(-1); ! ! vid->graphManager->GetCurrentMediaFormat(&mf); ! *flipH = (int) mf.flipH; ! *flipV = (int) mf.flipV; ! //vid->flipH = (int) mf.flipH; ! //vid->flipV = (int) mf.flipV; ! ! return (0); } int ar2VideoInqFreq(AR2VideoParamT *vid, float *fps) { - DS_MEDIA_FORMAT mf; - if (vid == NULL) return (-1); if (vid->graphManager == NULL) return(-1); ! ! vid->graphManager->GetCurrentMediaFormat(&mf); ! *fps = (float) mf.frameRate; ! return (0); } --- 242,265 ---- int ar2VideoInqFlipping(AR2VideoParamT *vid, int *flipH, int *flipV) { ! // DEPRECATED ! // image flipping can be specified in the XML config file, but can ! ! // no longer be queried via arVideoInqFlipping() ! ! return (-1); // not implemented } int ar2VideoInqFreq(AR2VideoParamT *vid, float *fps) { if (vid == NULL) return (-1); if (vid->graphManager == NULL) return(-1); ! ! double frames_per_second; ! ! vid->graphManager->GetCurrentMediaFormat(NULL,NULL,&frames_per_second,NULL); ! ! *fps = (float) frames_per_second; ! ! return (0); } |
|
From: Philip L. <phi...@us...> - 2005-07-23 00:01:46
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21989 Modified Files: calib_dist.vcproj calib_dist.c Log Message: Merge DSVideoLib-0.0.8b. Index: calib_dist.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** calib_dist.vcproj 4 Nov 2004 08:52:13 -0000 1.1.1.1 --- calib_dist.vcproj 23 Jul 2005 00:01:32 -0000 1.2 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 31,36 **** AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" GenerateDebugInformation="TRUE"/> <Tool --- 31,36 ---- AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" GenerateDebugInformation="TRUE"/> <Tool *************** *** 70,74 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)/../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 70,74 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> *************** *** 78,83 **** Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> <Tool Name="VCMIDLTool" --- 78,83 ---- Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> <Tool Name="VCMIDLTool" Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** calib_dist.c 20 Jul 2005 22:41:20 -0000 1.3 --- calib_dist.c 23 Jul 2005 00:01:33 -0000 1.4 *************** *** 52,56 **** # endif #elif defined(_WIN32) ! char *vconf = "flipV,showDlg"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; --- 52,56 ---- # endif #elif defined(_WIN32) ! char *vconf = "WDM_camera_flipV.xml"; #elif defined(__APPLE__) char *vconf = "-width=640 -height=480"; |
