artoolkit-commits Mailing List for ARToolKit (Page 9)
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: Hartmut S. <ret...@us...> - 2006-06-30 04:38:46
|
Update of /cvsroot/artoolkit/artoolkit/util/videoTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/videoTest Modified Files: videoTest.c Log Message: added GStreamer support Index: videoTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** videoTest.c 28 Jul 2005 21:58:42 -0000 1.6 --- videoTest.c 30 Jun 2006 04:38:40 -0000 1.7 *************** *** 21,25 **** char *vconf = "Data\\WDM_camera_flipV.xml"; #else ! char *vconf = ""; #endif --- 21,35 ---- char *vconf = "Data\\WDM_camera_flipV.xml"; #else ! ! /* ! char *vconf = "gst_arttoolkit.xml"; ! */ ! /* example for GStreamer based capture */ ! char *vconf = " videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; ! ! /* ! char *vconf = "filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; ! */ ! #endif *************** *** 27,31 **** int count = 0; ! char *cparam_name = "Data/camera_para.dat"; ARParam cparam; --- 37,41 ---- int count = 0; ! char *cparam_name = "Data/camera_para.dat"; ARParam cparam; *************** *** 41,44 **** --- 51,56 ---- //initialize applications glutInit(&argc, argv); + + init(); *************** *** 92,95 **** --- 104,108 ---- /* open the video path */ if( arVideoOpen( vconf ) < 0 ) exit(0); + /* find the size of the window */ if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:46
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/mk_patt Modified Files: mk_patt.c Log Message: added GStreamer support Index: mk_patt.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mk_patt.c 8 Jun 2006 22:04:40 -0000 1.8 --- mk_patt.c 30 Jun 2006 04:38:40 -0000 1.9 *************** *** 58,62 **** char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) --- 58,64 ---- char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc"; ! # elif defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:45
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/calib_cparam Modified Files: calib_cparam.c Log Message: added GStreamer support Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** calib_cparam.c 8 Jun 2006 21:31:21 -0000 1.12 --- calib_cparam.c 30 Jun 2006 04:38:40 -0000 1.13 *************** *** 61,65 **** char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) --- 61,67 ---- char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc"; ! # elif defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:45
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/include/AR Modified Files: config.h.in video.h Log Message: added GStreamer support Index: video.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/video.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** video.h 22 May 2006 22:17:53 -0000 1.6 --- video.h 30 Jun 2006 04:38:40 -0000 1.7 *************** *** 27,31 **** * The actual supported platforms (and the driver/library used) are: * - Windows: with Microsoft DirectShow (VFW obsolete). ! * - Linux: with Video4Linux library, IEEE1394 camera library, and DV camera library. * - Macintosh: with QuickTime. * - SGI: with VL. --- 27,31 ---- * The actual supported platforms (and the driver/library used) are: * - Windows: with Microsoft DirectShow (VFW obsolete). ! * - Linux: with Video4Linux library, GStreamer, IEEE1394 camera library and DV camera library. * - Macintosh: with QuickTime. * - SGI: with VL. *************** *** 45,48 **** --- 45,50 ---- * modified by Thomas Pintaric (pin...@im...) to add * a fully transparent DirectShow Driver. + * modified by Hartmut Seichter (ha...@te...) to add + * GStreamer video support * * \author Hirokazu Kato ka...@sy... *************** *** 50,57 **** * \author Thomas Pintaric pin...@im... (Windows DirectShow video support). * \author Philip Lamb ph...@ed... (Macintosh Quicktime video support). * \version 4.3b * \date 03/02/02 * - * */ /* -------------------------------------------------------------------------- --- 52,59 ---- * \author Thomas Pintaric pin...@im... (Windows DirectShow video support). * \author Philip Lamb ph...@ed... (Macintosh Quicktime video support). + * \author Hartmut Seichter ha...@te... (GStreamer Video support) * \version 4.3b * \date 03/02/02 * */ /* -------------------------------------------------------------------------- *************** *** 106,109 **** --- 108,114 ---- # include <AR/sys/videoLinux1394Cam.h> # endif + # ifdef AR_INPUT_GSTREAMER + # include <AR/sys/videoGStreamer.h> + # endif #endif Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.h.in 14 Jun 2006 05:08:07 -0000 1.7 --- config.h.in 30 Jun 2006 04:38:40 -0000 1.8 *************** *** 13,28 **** #define AR_PIXEL_FORMAT_YUY2 AR_PIXEL_FORMAT_yuvs ! /*------------------------------------------------------------*/ ! /* */ ! /* For Linux, you should define one of below 3 input method */ ! /* AR_INPUT_V4L: use of standard Video4Linux Library */ ! /* AR_INPUT_DV: use of DV Camera */ ! /* AR_INPUT_1394CAM: use of 1394 Digital Camara */ ! /* */ ! /*------------------------------------------------------------*/ #ifdef __linux #undef AR_INPUT_V4L #undef AR_INPUT_DV #undef AR_INPUT_1394CAM # ifdef AR_INPUT_V4L --- 13,30 ---- #define AR_PIXEL_FORMAT_YUY2 AR_PIXEL_FORMAT_yuvs ! /*--------------------------------------------------------------*/ ! /* */ ! /* For Linux, you should define one of below 4 input method */ ! /* AR_INPUT_V4L: use of standard Video4Linux Library */ ! /* AR_INPUT_GSTREAMER: use of GStreamer Media Framework */ ! /* AR_INPUT_DV: use of DV Camera */ ! /* AR_INPUT_1394CAM: use of 1394 Digital Camera */ ! /* */ ! /*--------------------------------------------------------------*/ #ifdef __linux #undef AR_INPUT_V4L #undef AR_INPUT_DV #undef AR_INPUT_1394CAM + #undef AR_INPUT_GSTREAMER # ifdef AR_INPUT_V4L *************** *** 42,45 **** --- 44,51 ---- # endif + # ifdef AR_INPUT_GSTREAMER + # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB + # endif + # undef AR_BIG_ENDIAN # define AR_LITTLE_ENDIAN |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:45
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/lib/SRC/VideoGStreamer Added Files: Makefile.in video.c Log Message: added GStreamer support --- NEW FILE: Makefile.in --- # # For instalation. Change this to your settings. # INC_DIR = ../../../include LIB_DIR = ../.. # # compiler # CC=cc CFLAG= @CFLAG@ -I$(INC_DIR) # # For making the library # AR= ar ARFLAGS= @ARFLAG@ # # products # LIB= ${LIB_DIR}/libARvideo.a INCLUDE= ${INC_DIR}/AR/video.h # # compilation control # LIBOBJS= ${LIB}(video.o) \ ${LIB}(video2.o) all: ${LIBOBJS} ${LIBOBJS}: ${INCLUDE} .c.a: ${CC} -c ${CFLAG} $< ${AR} ${ARFLAGS} $@ $*.o rm -f $*.o clean: rm -f *.o rm -f ${LIB} allclean: rm -f *.o rm -f ${LIB} rm -f Makefile --- NEW FILE: video.c --- /* * Video capture module utilising the GStreamer pipeline for AR Toolkit * * (c) Copyrights 2003-2006 Hartmut Seichter * * licensed under the terms of the GPL v2.0 * */ /* include AR Toolkit*/ #include <AR/config.h> #include <AR/ar.h> #include <AR/video.h> /* include GLib for GStreamer */ #include <glib.h> /* include GStreamer itself */ #include <gst/gst.h> /* using memcpy */ #include <string.h> static AR2VideoParamT *gVid = 0; static gboolean cb_have_data (GstPad *pad, GstBuffer *buffer, gpointer u_data) { const GstCaps *caps; GstStructure *str; gint width,height; gdouble rate; AR2VideoParamT *vid = (AR2VideoParamT*)u_data; /* only do initialy for the buffer */ if (vid->videoBuffer == 0) { /* * Get the capabilities of the frame, we need that in order * to extract information about the frame */ caps=gst_pad_get_negotiated_caps(pad); str=gst_caps_get_structure(caps,0); /* Get some data about the frame */ gst_structure_get_int(str,"width",&width); gst_structure_get_int(str,"height",&height); gst_structure_get_double(str,"framerate",&rate); g_print("libARvideo: GStreamer negotiated %dx%d\n",width,height); vid->width = width; vid->height = height; /* allocate the buffer */ vid->videoBuffer = malloc(buffer->size); return TRUE; } else { /* copy the video buffer */ memcpy(vid->videoBuffer, buffer->data, buffer->size); } return TRUE; } int arVideoOpen( char *config ) { if( gVid != NULL ) { printf("Device has been opened!!\n"); return -1; } gVid = ar2VideoOpen( config ); if( gVid == NULL ) return -1; } int arVideoClose( void ) { return ar2VideoClose(gVid); } int arVideoDispOption( void ) { return 0; } int arVideoInqSize( int *x, int *y ) { ar2VideoInqSize(gVid,x,y); return 0; } ARUint8 *arVideoGetImage( void ) { return ar2VideoGetImage(gVid); // address of your image data } int arVideoCapStart( void ) { ar2VideoCapStart(gVid); return 0; } int arVideoCapStop( void ) { ar2VideoCapStop(gVid); return 0; } int arVideoCapNext( void ) { ar2VideoCapNext(gVid); return 0; } /*---------------------------------------------------------------------------*/ AR2VideoParamT* ar2VideoOpen(char *config ) { AR2VideoParamT *vid = 0; GError *error = 0; int i; GstPad *pad; GstXML *xml; /* initialise GStreamer */ gst_init(0,0); /* init ART structure */ arMalloc( vid, AR2VideoParamT, 1 ); /* initialise buffer */ vid->videoBuffer = 0; /* report the current version and features */ g_print ("libARvideo: %s\n", gst_version_string()); #if 0 xml = gst_xml_new(); /* first check if config contains an xml file */ if (gst_xml_parse_file(xml,config,NULL)) { /* parse the pipe definition */ } else { vid->pipeline = gst_xml_get_element(xml,"pipeline"); } #endif vid->pipeline = gst_parse_launch (config, &error); if (!vid->pipeline) { g_print ("Parse error: %s\n", error->message); return 0; }; /* get the video sink */ vid->probe = gst_bin_get_by_name(GST_BIN(vid->pipeline), "artoolkit"); if (!vid->probe) { g_print("Pipeline has no element named 'artoolkit'!\n"); return 0; }; /* get the pad from the probe (the source pad seems to be more flexible) */ pad = gst_element_get_pad (vid->probe, "src"); /* install the probe callback for capturing */ gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid); /* dismiss the pad */ gst_object_unref (pad); /* request ready state */ gst_element_set_state (vid->pipeline, GST_STATE_READY); /* check if stream is ready */ if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) { g_error ("libARvideo: failed to put GStreamer into READY state!\n"); } else { g_print ("libARvideo: GStreamer pipeline is READY!\n"); } /* Needed to fill the information for ARVidInfo */ gst_element_set_state (vid->pipeline, GST_STATE_PAUSED); /* wait until it's up and running or failed */ if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) { g_error ("libARvideo: failed to put GStreamer into PAUSE state!\n"); } else { g_print ("libARvideo: GStreamer pipeline is PAUSED!\n"); } #if 0 /* write the bin to stdout */ gst_xml_write_file (GST_ELEMENT (vid->pipeline), stdout); #endif /* return the video handle */ return vid; }; int ar2VideoClose(AR2VideoParamT *vid) { /* stop the pipeline */ gst_element_set_state (vid->pipeline, GST_STATE_NULL); /* free the pipeline handle */ gst_object_unref (GST_OBJECT (vid->pipeline)); return 0; } ARUint8* ar2VideoGetImage(AR2VideoParamT *vid) { /* just return the bare video buffer */ return vid->videoBuffer; } int ar2VideoCapStart(AR2VideoParamT *vid) { GstStateChangeReturn _ret; /* set playing state of the pipeline */ _ret = gst_element_set_state (vid->pipeline, GST_STATE_PLAYING); if (_ret == GST_STATE_CHANGE_ASYNC) { /* wait until it's up and running or failed */ if (gst_element_get_state (vid->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE) == GST_STATE_CHANGE_FAILURE) { g_error ("libARvideo: failed to put GStreamer into PLAYING state!\n"); return 0; } } return 1; } int ar2VideoCapStop(AR2VideoParamT *vid) { /* stop pipeline */ return gst_element_set_state (vid->pipeline, GST_STATE_NULL); } int ar2VideoCapNext(AR2VideoParamT *vid) { /* gstreamer should */ return TRUE; } int ar2VideoInqSize(AR2VideoParamT *vid, int *x, int *y ) { *x = vid->width; // width of your static image *y = vid->height; // height of your static image } |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:45
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/calib_camera2 Modified Files: main.c Log Message: added GStreamer support Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** main.c 8 Jun 2006 21:36:52 -0000 1.11 --- main.c 30 Jun 2006 04:38:40 -0000 1.12 *************** *** 61,65 **** static char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) --- 61,67 ---- static char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; ! # elif defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:44
|
Update of /cvsroot/artoolkit/artoolkit/examples/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/examples/simple Modified Files: simpleTest.c Log Message: added GStreamer support Index: simpleTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** simpleTest.c 28 Jul 2005 20:31:04 -0000 1.5 --- simpleTest.c 30 Jun 2006 04:38:40 -0000 1.6 *************** *** 21,26 **** --- 21,34 ---- char *vconf = "Data\\WDM_camera_flipV.xml"; #else + #ifdef AR_INPUT_GSTREAMER + char *vconf = "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; + /* + char *vconf = "filesrc location=/home/joe_sample/Media/gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! videorate ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; + */ + + #else char *vconf = ""; #endif + #endif int xsize, ysize; |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:44
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/include/AR/sys Added Files: videoGStreamer.h Log Message: added GStreamer support --- NEW FILE: videoGStreamer.h --- /* * Video capture module utilising the GStreamer pipeline for AR Toolkit * * (c) Copyrights 2003-2006 Hartmut Seichter * * Licensed under the terms of the GPL * */ #ifndef AR_VIDEO_GSTREAMER_H #define AR_VIDEO_GSTREAMER_H #ifdef __cplusplus extern "C" { #endif #include <AR/config.h> #include <AR/ar.h> #include <gst/gst.h> typedef struct { /* GStreamer pipeline */ GstElement *pipeline; /* GStreamer identity needed for probing */ GstElement *probe; /* size of the image */ int width, height; /* the actual video buffer */ ARUint8 *videoBuffer; } AR2VideoParamT; #ifdef __cplusplus } #endif #endif |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:43
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/calib_distortion Modified Files: calib_dist.c Log Message: added GStreamer support Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** calib_dist.c 21 Apr 2006 04:34:59 -0000 1.13 --- calib_dist.c 30 Jun 2006 04:38:40 -0000 1.14 *************** *** 61,65 **** char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) --- 61,67 ---- char *vconf = "-size=FULL"; #elif defined(__linux) ! # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc"; ! # elif defined(AR_INPUT_V4L) char *vconf = "-width=640 -height=480"; # elif defined(AR_INPUT_1394CAM) |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:38:42
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247 Modified Files: Configure README.txt Log Message: added GStreamer support Index: Configure =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/Configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Configure 10 Mar 2005 04:00:22 -0000 1.5 --- Configure 30 Jun 2006 04:38:39 -0000 1.6 *************** *** 10,13 **** --- 10,14 ---- lib/SRC/VideoLinuxV4L lib/SRC/VideoSGI \ lib/SRC/VideoMacOSX \ + lib/SRC/VideoGStreamer \ lib/SRC/ARvrml \ util \ *************** *** 35,38 **** --- 36,40 ---- echo " 3: Digital Video Camcoder through IEEE 1394 (DV Format)" echo " 4: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)" + echo " 5: GStreamer Media Framework" echo -n "Enter : " read ANS *************** *** 86,93 **** echo "Please enter y or n." exit 0 ! fi ! else ! echo "Please enter 1,2,3 or 4." exit 0 fi --- 88,106 ---- echo "Please enter y or n." exit 0 ! fi ! elif [ "$ANS" = "5" ] ! then ! VIDEO_DRIVER="VideoGStreamer" ! GST_INCLUDE=`pkg-config --cflags gstreamer-0.10` ! GST_LIBS=`pkg-config --libs gstreamer-0.10` ! ! CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include" ! LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib" ! ARFLAG="rs" ! RANLIB="" ! LIBS="-lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm" ! CONFIG="AR_INPUT_GSTREAMER" else ! echo "Please enter 1,2,3,4 or 5." exit 0 fi Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** README.txt 18 Jun 2006 23:56:29 -0000 1.21 --- README.txt 30 Jun 2006 04:38:39 -0000 1.22 *************** *** 63,67 **** Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: tar zxvf ARToolKit-2.71.3.tgz ! Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} ./Configure --- 63,67 ---- Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: tar zxvf ARToolKit-2.71.3.tgz ! Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} ./Configure *************** *** 173,175 **** -- ! EOF \ No newline at end of file --- 173,175 ---- -- ! EOF |
|
From: Hartmut S. <ret...@us...> - 2006-06-30 04:36:34
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10412/lib/SRC/VideoGStreamer Log Message: Directory /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer added to the repository |
|
From: Philip L. <phi...@us...> - 2006-06-23 06:42:43
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29626 Modified Files: video.c Log Message: Fix VRML lib inclusion, and detect emulated PPC on Intel. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** video.c 18 Jun 2006 22:52:27 -0000 1.19 --- video.c 23 Jun 2006 06:42:39 -0000 1.20 *************** *** 81,87 **** --- 81,90 ---- #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> + #include <CoreServices/CoreServices.h> // Gestalt() #include <pthread.h> #include <sys/time.h> #include <unistd.h> // usleep() + #include <sys/types.h> // sysctlbyname() + #include <sys/sysctl.h> // sysctlbyname() #include <AR/config.h> #include <AR/ar.h> *************** *** 93,99 **** // ============================================================================ - #ifndef __i386__ // Hack: don't do buffercopy on Intel Macs. - # define AR_VIDEO_DEBUG_BUFFERCOPY // Uncomment to have ar2VideoGetImage() return a copy of video pixel data. - #endif //#define AR_VIDEO_SUPPORT_OLD_QUICKTIME // Uncomment to allow use of non-thread safe QuickTime (pre-6.4). #define AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE --- 96,99 ---- *************** *** 1158,1161 **** --- 1158,1209 ---- } + static int sysctlbyname_with_pid (const char *name, pid_t pid, + void *oldp, size_t *oldlenp, + void *newp, size_t newlen) + { + if (pid == 0) { + if (sysctlbyname(name, oldp, oldlenp, newp, newlen) == -1) { + fprintf(stderr, "sysctlbyname_with_pid(0): sysctlbyname failed:" + "%s\n", strerror(errno)); + return -1; + } + } else { + int mib[CTL_MAXNAME]; + size_t len = CTL_MAXNAME; + if (sysctlnametomib(name, mib, &len) == -1) { + fprintf(stderr, "sysctlbyname_with_pid: sysctlnametomib failed:" + "%s\n", strerror(errno)); + return -1; + } + mib[len] = pid; + len++; + if (sysctl(mib, len, oldp, oldlenp, newp, newlen) == -1) { + fprintf(stderr, "sysctlbyname_with_pid: sysctl failed:" + "%s\n", strerror(errno)); + return -1; + } + } + return 0; + } + + // Pass 0 to use current PID. + int is_pid_native (pid_t pid) + { + int ret = 0; + size_t sz = sizeof(ret); + if (sysctlbyname_with_pid("sysctl.proc_native", pid, + &ret, &sz, NULL, 0) == -1) { + if (errno == ENOENT) { + // sysctl doesn't exist, which means that this version of Mac OS + // pre-dates Rosetta, so the application must be native. + return 1; + } + fprintf(stderr, "is_pid_native: sysctlbyname_with_pid failed:" + "%s\n", strerror(errno)); + return -1; + } + return ret; + } + #pragma mark - *************** *** 1215,1218 **** --- 1263,1267 ---- GDHandle theSavedDevice; Rect sourceRect = {0, 0}; + long cpuType; // Process configuration options. *************** *** 1367,1376 **** //vid->timeScale = 0; vid->grabber = grabber; - #ifdef AR_VIDEO_DEBUG_BUFFERCOPY - vid->bufCopyFlag = 1; - #else - vid->bufCopyFlag = 0; - #endif // AR_VIDEO_DEBUG_BUFFERCOPY if(!(vid->pVdg = vdgAllocAndInit(grabber))) { --- 1416,1441 ---- //vid->timeScale = 0; vid->grabber = grabber; + // Find out if we are running on an Intel Mac. + if ((err_s = Gestalt(gestaltNativeCPUtype, &cpuType) != noErr)) { + fprintf(stderr, "ar2VideoOpen(): Error getting native CPU type.\n"); + goto out1; + } + if (cpuType == gestaltCPUPentium) { + // We are running on an Intel-based Mac. + vid->bufCopyFlag = 0; //Hack: don't do buffercopy on Intel Macs. + printf("Detected Intel CPU.\n"); + } else { + int native = is_pid_native(0); + // We are not. But are we running under Rosetta? + if (native == 0) { + // We're running under Rosetta. + vid->bufCopyFlag = 0; + printf("Detected Intel CPU, but running PowerPC code under Rosetta.\n"); + } else { + // Error if < 0, or native if 1. + vid->bufCopyFlag = 1; + } + } if(!(vid->pVdg = vdgAllocAndInit(grabber))) { |
|
From: Philip L. <phi...@us...> - 2006-06-23 06:42:32
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29207 Modified Files: project.pbxproj Log Message: Fix VRML lib inclusion, and detect emulated PPC on Intel. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** project.pbxproj 18 Jun 2006 23:56:20 -0000 1.14 --- project.pbxproj 23 Jun 2006 06:42:27 -0000 1.15 *************** *** 116,119 **** --- 116,135 ---- /* Begin PBXBuildFile section */ + 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; + 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; + 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; + 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; + 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; + 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; + 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; + 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; + 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; + 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; + 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; + 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; + 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; + 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; + 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; + 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; 4A3F11510649F8040042B0D7 /* mAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2B0484329900B56093 /* mAlloc.c */; }; 4A3F11570649F8050042B0D7 /* mAllocDup.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2C0484329900B56093 /* mAllocDup.c */; }; *************** *** 382,387 **** 788C83CD089AB795003E3825 /* simpleVRML.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A1308B1075BE4A700D62ACD /* simpleVRML.c */; }; 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D80086A2DB700DF2FAC /* libARvrml.a */; }; - 788C83DF089AB7FC003E3825 /* libopenvrml-gl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */; }; - 788C83E0089AB802003E3825 /* libopenvrml.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A16075C27F900D62ACD /* libopenvrml.dylib */; }; 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A19075C284C00D62ACD /* libstdc++.a */; }; 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */; }; --- 398,401 ---- *************** *** 1260,1263 **** --- 1274,1297 ---- /* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ + 4A304AD40A4B8C23003AD621 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */, + 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */, + 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */, + 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */, + 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */, + 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */, + 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */, + 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + /* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 4A0D818507526B1B00CB0B40 /* ChangeLog.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog.txt; sourceTree = "<group>"; }; *************** *** 1266,1271 **** 4A1308B0075BE4A700D62ACD /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; 4A1308B1075BE4A700D62ACD /* simpleVRML.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleVRML.c; sourceTree = "<group>"; }; - 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.dylib"; path = "/sw/lib/libopenvrml-gl.dylib"; sourceTree = "<absolute>"; }; - 4A130A16075C27F900D62ACD /* libopenvrml.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.dylib; path = /sw/lib/libopenvrml.dylib; sourceTree = "<absolute>"; }; 4A130A19075C284C00D62ACD /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/gcc/darwin/3.3/libstdc++.a"; sourceTree = "<absolute>"; }; 4A130A48075C2C1B00D62ACD /* simpleVRML.vcproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = simpleVRML.vcproj; sourceTree = "<group>"; }; --- 1300,1303 ---- *************** *** 1273,1276 **** --- 1305,1316 ---- 4A2244950659A20D0014DA8E /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; 4A2246520659B1EA0014DA8E /* simpleLite */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = simpleLite; sourceTree = "<group>"; }; + 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.62.0.0.dylib; path = openvrml/lib/libjpeg.62.0.0.dylib; sourceTree = "<group>"; }; + 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmozjs.dylib; path = openvrml/lib/libmozjs.dylib; sourceTree = "<group>"; }; + 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libnspr4.dylib; path = openvrml/lib/libnspr4.dylib; sourceTree = "<group>"; }; + 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.5.0.1.dylib"; path = "openvrml/lib/libopenvrml-gl.5.0.1.dylib"; sourceTree = "<group>"; }; + 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.4.0.1.dylib; path = openvrml/lib/libopenvrml.4.0.1.dylib; sourceTree = "<group>"; }; + 4A304AE00A4B8D98003AD621 /* libplc4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplc4.dylib; path = openvrml/lib/libplc4.dylib; sourceTree = "<group>"; }; + 4A304AE10A4B8D98003AD621 /* libplds4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplds4.dylib; path = openvrml/lib/libplds4.dylib; sourceTree = "<group>"; }; + 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng.3.1.2.7.dylib; path = openvrml/lib/libpng.3.1.2.7.dylib; sourceTree = "<group>"; }; 4A307DCF07DD3E7B00613859 /* ARVideoSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARVideoSettingsController.m; sourceTree = "<group>"; }; 4A3F14FC064A0C510042B0D7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; *************** *** 1864,1871 **** 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, - 788C83DF089AB7FC003E3825 /* libopenvrml-gl.dylib in Frameworks */, - 788C83E0089AB802003E3825 /* libopenvrml.dylib in Frameworks */, - 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */, 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; --- 1904,1917 ---- 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */, + 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */, + 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */, + 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */, + 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */, + 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */, + 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */, + 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */, + 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */, + 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1987,1990 **** --- 2033,2044 ---- isa = PBXGroup; children = ( + 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */, + 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */, + 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */, + 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */, + 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */, + 4A304AE00A4B8D98003AD621 /* libplc4.dylib */, + 4A304AE10A4B8D98003AD621 /* libplds4.dylib */, + 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */, 4A934B5C086A150A00DF2FAC /* Cocoa.framework */, 4A3F167F064A0E270042B0D7 /* Carbon.framework */, *************** *** 1992,1997 **** 4A3F14FD064A0C510042B0D7 /* OpenGL.framework */, 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */, - 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */, - 4A130A16075C27F900D62ACD /* libopenvrml.dylib */, 4A130A19075C284C00D62ACD /* libstdc++.a */, 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */, --- 2046,2049 ---- *************** *** 3169,3172 **** --- 3221,3225 ---- 788C83B7089AB6AE003E3825 /* Sources */, 788C83B9089AB6AE003E3825 /* Frameworks */, + 4A304AD40A4B8C23003AD621 /* CopyFiles */, ); buildRules = ( *************** *** 4922,4929 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! include, ! /sw/include/openvrml, ! /usr/X11R6/include, ); INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 4975,4984 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! /sw/include, ! "$(HEADER_SEARCH_PATHS_QUOTED_1)", ! "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); + HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; + HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 4945,4952 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! include, ! /sw/include/openvrml, ! /usr/X11R6/include, ); INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 5000,5009 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! /sw/include, ! "$(HEADER_SEARCH_PATHS_QUOTED_1)", ! "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); + HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; + HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 5646,5654 **** INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( - lib, /sw/lib, /usr/lib/gcc/darwin/3.3, ! "$(SRCROOT)/lib", ); PRODUCT_NAME = simpleVRML; }; --- 5703,5713 ---- INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( /sw/lib, /usr/lib/gcc/darwin/3.3, ! "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ! "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; *************** *** 5667,5671 **** --- 5726,5732 ---- /usr/lib/gcc/darwin/3.3, "$(SRCROOT)/lib", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; |
|
From: Philip L. <phi...@us...> - 2006-06-18 23:56:33
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1551 Modified Files: ChangeLog.txt README.txt Log Message: Update for 2.71.3 release. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog.txt 5 Apr 2006 05:48:54 -0000 1.6 --- ChangeLog.txt 18 Jun 2006 23:56:29 -0000 1.7 *************** *** 3,15 **** ! Changes in this release (2006-??-??). ! ------------------------------------- ! - Removed XCode project file for versions prior to XCode 2.1. - Fixed line endings in MS Visual Studio 6 project files calib_distortion.dsp and calib_camera2.dsp. - Cleaned up pixel format specification in config.h, borrowing code from gsub_lite. Changes in version 2.71.2 (2005-10-11). ! ------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. --- 3,21 ---- ! Changes in version 2.71.3 (this release) (2006-06-19). ! ------------------------------------------------------ ! - This release supports Mac OS X on Intel, and builds Universal binaries, with the exception of the VRML projects (since OpenVRML does not yet build on Mac OS X i386). - Fixed line endings in MS Visual Studio 6 project files calib_distortion.dsp and calib_camera2.dsp. + - Fix for a bug in VideoLinuxDV identified by Simon Goodall, where video stream could be incorrectly closed twice (SF 1452403). + - The Win32 video library now accepts in the config string either the pathname of an XML file, or raw XML. The string is treated as raw XML if the first 5 characters are "<?xml". + - The Mac OS X video library won't return a copy of the acquired image if running on an Intel Mac. This is a workaround for a driver issue. It may cause problems and a more robust solution is coming. + - Fixed a bug in pattern extraction which occured when AR_PATTERN_SIZE_X and AR_PATTERN_SIZE_Y were not equal. + - Rewrite of mk_patt.c to use gsub_lite. - Cleaned up pixel format specification in config.h, borrowing code from gsub_lite. + - Fix long-standing bug in gsub_lite when drawing to fullscreen windows in drawpixels mode. Changes in version 2.71.2 (2005-10-11). ! --------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** README.txt 12 Oct 2005 00:27:43 -0000 1.20 --- README.txt 18 Jun 2006 23:56:29 -0000 1.21 *************** *** 1,3 **** ! Read me for ARToolKit-2.71.2. ============================= --- 1,3 ---- ! Read me for ARToolKit-2.71.3. ============================= *************** *** 10,13 **** --- 10,14 ---- Building on Mac OS X. Changes in this release. + Known issues in this release. Changes in earlier releases. *************** *** 15,19 **** About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.2. ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt. --- 16,20 ---- About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.3. ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt. *************** *** 27,31 **** HIT Lab NZ http://www.hitlabnz.org ! 2005-10-11 --- 28,32 ---- HIT Lab NZ http://www.hitlabnz.org ! 2006-06-19 *************** *** 61,65 **** Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.71.2.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} --- 62,66 ---- Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.71.3.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} *************** *** 85,89 **** * Apple's Developer Tools. http://developer.apple.com * Camera driver. Mac OS X 10.3 and later include an inbuilt IIDC and DV FireWire camera driver. USB camera drivers, and Firewire camera drivers for pre-10.3 systems can be obtained from ioXperts at http://www.ioxperts.com. ! * (Optional, for VRML renderer only) Apple X11 and Fink. Install X11 off the Mac OS X install CD 3 or download an install disk image from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. Download Fink (and optionally, FinkCommander) from http://fink.sourceforge.net/download/. Building using the XCode IDE: --- 86,91 ---- * Apple's Developer Tools. http://developer.apple.com * Camera driver. Mac OS X 10.3 and later include an inbuilt IIDC and DV FireWire camera driver. USB camera drivers, and Firewire camera drivers for pre-10.3 systems can be obtained from ioXperts at http://www.ioxperts.com. ! * (Optional, for VRML renderer only) Apple X11. Install X11 from the Mac OS X installer, from the "Optional installs" package, or download an install disk image from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. ! * (Optional, for VRML renderer only) OpenVRML-0.14.3-MacOSX.tar.gz. Download from http://sf.net/projects/artoolkit, or alternatively install via Fink. Download Fink (and optionally, FinkCommander) from http://fink.sourceforge.net/download/. Building using the XCode IDE: *************** *** 93,97 **** The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! (4) Using FinkCommander, do a binary install of mozilla-dev, followed by an install of openvrml4-dev and openvrml-gl5-dev. (5) Select the ARToolKit extensions target, and build. --- 95,99 ---- The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! (4) Unpack the OpenVRML .tar.gz into the ARToolKit folder, or alternatively, if using FinkCommander, do a binary install of mozilla-dev, followed by an install of openvrml4-dev and openvrml-gl5-dev. (5) Select the ARToolKit extensions target, and build. *************** *** 99,103 **** Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.71.2.tgz Configure and build cd ~/ARToolKit --- 101,105 ---- Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.71.3.tgz Configure and build cd ~/ARToolKit *************** *** 109,114 **** The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! fink -b install mozilla-dev ! fink install openvrml4-dev openvrml-gl5-dev cd ~/Desktop/ARToolKit/lib/SRC/ARvrml make --- 111,120 ---- The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! Either: ! tar xzvf OpenVRML-0.14.3-MacOSX.tar.gz ~/Desktop/ARToolKit ! Or: ! fink -b install mozilla-dev ! fink install openvrml4-dev openvrml-gl5-dev ! Then: cd ~/Desktop/ARToolKit/lib/SRC/ARvrml make *************** *** 119,123 **** ! Changes in this release (2005-10-11). ------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. --- 125,148 ---- ! Changes in version 2.71.3 (this release) (2006-06-19). ! ------------------------------------------------------ ! - This release supports Mac OS X on Intel, and builds Universal binaries, with the exception of the VRML projects (since OpenVRML does not yet build on Mac OS X i386). ! - Fixed line endings in MS Visual Studio 6 project files calib_distortion.dsp and calib_camera2.dsp. ! - Fix for a bug in VideoLinuxDV identified by Simon Goodall, where video stream could be incorrectly closed twice (SF 1452403). ! - The Win32 video library now accepts in the config string either the pathname of an XML file, or raw XML. The string is treated as raw XML if the first 5 characters are "<?xml". ! - The Mac OS X video library won't return a copy of the acquired image if running on an Intel Mac. This is a workaround for a driver issue. It may cause problems and a more robust solution is coming. ! - Fixed a bug in pattern extraction which occured when AR_PATTERN_SIZE_X and AR_PATTERN_SIZE_Y were not equal. ! - Rewrite of mk_patt.c to use gsub_lite. ! - Cleaned up pixel format specification in config.h, borrowing code from gsub_lite. ! - Fix long-standing bug in gsub_lite when drawing to fullscreen windows in drawpixels mode. ! ! ! Known issues in this release. ! ----------------------------- ! - On Mac OS X, the macam webcam driver may cause problems such as the camera settings dialog exploding and hanging the app. A workaround is to either remove the file /Library/Quicktime/macam.component, or to add "-standarddialog" to the video configuration string. ! - On Windows, MSVS.Net 2005 is not yet supported. The toolkit will build under it, with the exception of libARvrml and simpleVRML. ! ! ! Changes in version 2.71.2 (2005-10-11). ------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. |
|
From: Philip L. <phi...@us...> - 2006-06-18 23:56:26
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1520 Modified Files: project.pbxproj Log Message: Update for 2.71.3 release. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.pbxproj 8 Jun 2006 22:16:37 -0000 1.13 --- project.pbxproj 18 Jun 2006 23:56:20 -0000 1.14 *************** *** 14,29 **** 78A12B7708B679AC00572F0B /* ShellScript */, ); - buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "ARToolKit libraries"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", [...1415 lines suppressed...] - <string>1.0</string> - </dict> - </plist> - "; productType = "com.apple.product-type.application"; }; --- 3264,3267 ---- *************** *** 4321,4330 **** isa = PBXProject; buildConfigurationList = 4A7E913D085904A2001E80E8 /* Build configuration list for PBXProject "ARToolKit" */; - buildSettings = { - }; - buildStyles = ( - 014CEA520018CE5811CA2923 /* Development */, - 014CEA530018CE5811CA2923 /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* ARToolKit */; --- 3272,3275 ---- |
|
From: Philip L. <phi...@us...> - 2006-06-18 23:25:33
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20346 Modified Files: ARToolKit.sln Log Message: Update for change in mk_patt linkage. Index: ARToolKit.sln =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ARToolKit.sln 22 Sep 2005 20:37:22 -0000 1.6 --- ARToolKit.sln 18 Jun 2006 23:25:29 -0000 1.7 *************** *** 62,67 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}" ProjectSection(ProjectDependencies) = postProject - {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection --- 62,67 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}" ProjectSection(ProjectDependencies) = postProject {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} + {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection *************** *** 70,74 **** ProjectSection(ProjectDependencies) = postProject {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} - {1CB7F08A-A8E5-457B-A589-9878F126601D} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection --- 70,73 ---- *************** *** 76,81 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_dist", "util\calib_distortion\calib_dist.vcproj", "{0304C918-FB5D-5047-11BF-7DCB5020DFF4}" ProjectSection(ProjectDependencies) = postProject - {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection --- 75,80 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_dist", "util\calib_distortion\calib_dist.vcproj", "{0304C918-FB5D-5047-11BF-7DCB5020DFF4}" ProjectSection(ProjectDependencies) = postProject {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} + {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection *************** *** 83,88 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mk_patt", "util\mk_patt\mk_patt.vcproj", "{92E9C84C-BADB-EF76-FA80-740BA0F532DF}" ProjectSection(ProjectDependencies) = postProject {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} - {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection --- 82,87 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mk_patt", "util\mk_patt\mk_patt.vcproj", "{92E9C84C-BADB-EF76-FA80-740BA0F532DF}" ProjectSection(ProjectDependencies) = postProject + {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} EndProjectSection |
|
From: Philip L. <phi...@us...> - 2006-06-18 23:25:33
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20346/util/mk_patt Modified Files: Makefile.in mk_patt.vcproj mkpatt.dsp Log Message: Update for change in mk_patt linkage. Index: mkpatt.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mkpatt.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mkpatt.dsp 21 Sep 2005 17:55:16 -0000 1.2 --- mkpatt.dsp 18 Jun 2006 23:25:30 -0000 1.3 *************** *** 52,56 **** 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\mkpatt.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 52,56 ---- 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\mkpatt.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib *************** *** 78,82 **** 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\mkpattd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 78,82 ---- 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\mkpattd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/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 18 Jun 2006 23:25:30 -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: mk_patt.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mk_patt.vcproj 21 Sep 2005 17:55:16 -0000 1.3 --- mk_patt.vcproj 18 Jun 2006 23:25:30 -0000 1.4 *************** *** 1,117 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="mk_patt" ! ProjectGUID="{92E9C84C-BADB-EF76-FA80-740BA0F532DF}"> ! <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=""$(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 libARvideo.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="mk_patt.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,117 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="mk_patt" ! ProjectGUID="{92E9C84C-BADB-EF76-FA80-740BA0F532DF}"> ! <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=""$(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_lite.lib libARvideo.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="mk_patt.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:52:30
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6203 Modified Files: videoInternal.h video.c ARVideoSettingsController.h ARVideoSettingsController.m Log Message: Provide -standarddialog option. Index: ARVideoSettingsController.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ARVideoSettingsController.h 22 May 2006 22:18:25 -0000 1.2 --- ARVideoSettingsController.h 18 Jun 2006 22:52:27 -0000 1.3 *************** *** 40,44 **** - (id)initInput:(int)inInputIndex withSeqGrabComponent:(SeqGrabComponent)inSeqGrab withSGChannel:(SGChannel)inSgchanVideo; - (void)dealloc; ! - (IBAction)sgConfigurationDialog:(id)sender; - (OSErr)loadUserData:(UserData *)outUserData fromDefaults:(NSUserDefaults *)inDefaults forKey:(NSString *)inKey; - (OSErr)saveUserData:(UserData)inUserData toDefaults:(NSUserDefaults *)inDefaults withKey:(NSString *)outKey; --- 40,44 ---- - (id)initInput:(int)inInputIndex withSeqGrabComponent:(SeqGrabComponent)inSeqGrab withSGChannel:(SGChannel)inSgchanVideo; - (void)dealloc; ! - (IBAction)sgConfigurationDialog:(id)sender withStandardDialog:(int)standardDialog; - (OSErr)loadUserData:(UserData *)outUserData fromDefaults:(NSUserDefaults *)inDefaults forKey:(NSString *)inKey; - (OSErr)saveUserData:(UserData)inUserData toDefaults:(NSUserDefaults *)inDefaults withKey:(NSString *)outKey; Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** video.c 8 Jun 2006 22:05:08 -0000 1.18 --- video.c 18 Jun 2006 22:52:27 -0000 1.19 *************** *** 348,357 **** } ! static ComponentResult vdgRequestSettings(VdigGrab* pVdg, const int showDialog, const int inputIndex) { ComponentResult err; // Use the SG Dialog to allow the user to select device and compression settings ! if (err = RequestSGSettings(inputIndex, pVdg->seqGrab, pVdg->sgchanVideo, showDialog)) { fprintf(stderr, "RequestSGSettings err=%ld\n", err); goto endFunc; --- 348,357 ---- } ! static ComponentResult vdgRequestSettings(VdigGrab* pVdg, const int showDialog, const int standardDialog, const int inputIndex) { ComponentResult err; // Use the SG Dialog to allow the user to select device and compression settings ! if (err = RequestSGSettings(inputIndex, pVdg->seqGrab, pVdg->sgchanVideo, showDialog, standardDialog)) { fprintf(stderr, "RequestSGSettings err=%ld\n", err); goto endFunc; *************** *** 1201,1204 **** --- 1201,1205 ---- int showFPS = 0; int showDialog = 1; + int standardDialog = 0; OSErr err_s = noErr; ComponentResult err = noErr; *************** *** 1243,1246 **** --- 1244,1249 ---- } else if (strncmp(a, "-nodialog", 9) == 0) { showDialog = 0; + } else if (strncmp(a, "-standarddialog", 15) == 0) { + standardDialog = 1; } else { err_i = 1; *************** *** 1376,1380 **** } ! if (err = vdgRequestSettings(vid->pVdg, showDialog, gVidCount)) { fprintf(stderr, "ar2VideoOpen(): vdgRequestSettings err=%ld.\n", err); goto out2; --- 1379,1383 ---- } ! if (err = vdgRequestSettings(vid->pVdg, showDialog, standardDialog, gVidCount)) { fprintf(stderr, "ar2VideoOpen(): vdgRequestSettings err=%ld.\n", err); goto out2; Index: ARVideoSettingsController.m =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ARVideoSettingsController.m 22 May 2006 22:18:25 -0000 1.5 --- ARVideoSettingsController.m 18 Jun 2006 22:52:27 -0000 1.6 *************** *** 78,116 **** // NOTE: There is a know bug in QuickTime 6.4 in which the // Settings Dialog pops up in random locations...sigh... ! - (IBAction) sgConfigurationDialog:(id)sender { - ComponentResult err; - Component *PanelListPtr = NULL; - long PanelCount; - // Set up the settings panel list removing the "Compression" panel. ! ComponentDescription cDesc; ! Component c; ! long cCount; ! Component *cPtr; ! ! cDesc.componentType = SeqGrabPanelType; ! cDesc.componentSubType = VideoMediaType; ! cDesc.componentManufacturer = cDesc.componentFlags = cDesc.componentFlagsMask = 0L; ! cCount = CountComponents(&cDesc); ! if (cCount == 0) { ! fprintf(stderr, "-sgConfigurationDialog: error in CountComponents().\n"); ! goto bail; ! } ! PanelListPtr = (Component *)NewPtr(sizeof(Component) * (cCount + 1)); ! if (err = MemError() || NULL == PanelListPtr) { ! fprintf(stderr, "-sgConfigurationDialog: error in NewPtr().\n"); ! goto bail; ! } ! ! PanelCount = 0; ! cPtr = PanelListPtr; ! c = 0L; ! do { ! ComponentDescription compInfo; ! c = FindNextComponent(c, &cDesc); ! if (c) { ! Handle hName = NewHandle(0); if (err = MemError() || NULL == hName) { fprintf(stderr, "-sgConfigurationDialog: error in NewHandle().\n"); --- 78,112 ---- // NOTE: There is a know bug in QuickTime 6.4 in which the // Settings Dialog pops up in random locations...sigh... ! - (IBAction) sgConfigurationDialog:(id)sender withStandardDialog:(int)standardDialog { // Set up the settings panel list removing the "Compression" panel. ! ComponentResult err; ! if (standardDialog) { ! err = SGSettingsDialog(seqGrab, sgchanVideo, 0, 0, seqGrabSettingsPreviewOnly, NULL, 0L); ! } else { ! ComponentDescription cDesc; ! long cCount; ! ComponentDescription cDesc2; ! ! cDesc.componentType = SeqGrabPanelType; ! cDesc.componentSubType = VideoMediaType; ! cDesc.componentManufacturer = cDesc.componentFlags = cDesc.componentFlagsMask = 0L; ! cCount = CountComponents(&cDesc); ! if (cCount == 0) { ! fprintf(stderr, "-sgConfigurationDialog: error in CountComponents().\n"); ! goto bail; ! } ! ! Component *PanelListPtr = (Component *)NewPtr(sizeof(Component) * (cCount + 1)); ! if (err = MemError() || NULL == PanelListPtr) { ! fprintf(stderr, "-sgConfigurationDialog: error in NewPtr().\n"); ! goto bail; ! } ! Component *cPtr = PanelListPtr; ! long PanelCount = 0L; ! Component c = NULL; ! while ((c = FindNextComponent(c, &cDesc)) != NULL) { ! Handle hName = NewHandleClear(0); if (err = MemError() || NULL == hName) { fprintf(stderr, "-sgConfigurationDialog: error in NewHandle().\n"); *************** *** 118,133 **** } ! GetComponentInfo(c, &compInfo, hName, NULL, NULL); if (PLstrcmp(*(unsigned char **)hName, "\pCompression") != 0) { ! *cPtr++ = c; PanelCount++; } DisposeHandle(hName); } ! } while (c); ! ! // Bring up the dialog and if the user didn't cancel ! // save the new channel settings for later. ! err = SGSettingsDialog(seqGrab, sgchanVideo, PanelCount, PanelListPtr, 0, NULL, 0L); if (err == noErr) { // Dispose the old settings and get the new channel settings. --- 114,133 ---- } ! GetComponentInfo(c, &cDesc2, hName, NULL, NULL); if (PLstrcmp(*(unsigned char **)hName, "\pCompression") != 0) { ! *cPtr = c; ! cPtr++; PanelCount++; } DisposeHandle(hName); } ! ! // Bring up the dialog and if the user didn't cancel ! // save the new channel settings for later. ! err = SGSettingsDialog(seqGrab, sgchanVideo, PanelCount, PanelListPtr, seqGrabSettingsPreviewOnly, NULL, 0L); ! bail: ! DisposePtr((Ptr)PanelListPtr); ! } ! if (err == noErr) { // Dispose the old settings and get the new channel settings. *************** *** 147,153 **** fprintf(stderr, "-sgConfigurationDialog: error %ld in SGSettingsDialog().\n", err); } - - bail: - DisposePtr((Ptr)PanelListPtr); } --- 147,150 ---- *************** *** 212,216 **** @end ! OSStatus RequestSGSettings(const int inputIndex, SeqGrabComponent seqGrab, SGChannel sgchanVideo, const int showDialog) { NSAutoreleasePool *localPool; --- 209,213 ---- @end ! OSStatus RequestSGSettings(const int inputIndex, SeqGrabComponent seqGrab, SGChannel sgchanVideo, const int showDialog, const int standardDialog) { NSAutoreleasePool *localPool; *************** *** 224,228 **** localController = [[ARVideoSettingsController alloc] initInput:inputIndex withSeqGrabComponent:seqGrab withSGChannel:sgchanVideo]; ! if (showDialog) [localController sgConfigurationDialog:NULL]; [localController release]; --- 221,225 ---- localController = [[ARVideoSettingsController alloc] initInput:inputIndex withSeqGrabComponent:seqGrab withSGChannel:sgchanVideo]; ! if (showDialog) [localController sgConfigurationDialog:NULL withStandardDialog:standardDialog]; [localController release]; Index: videoInternal.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/videoInternal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** videoInternal.h 22 May 2006 22:18:25 -0000 1.2 --- videoInternal.h 18 Jun 2006 22:52:27 -0000 1.3 *************** *** 36,40 **** #endif ! OSStatus RequestSGSettings(const int inputIndex, SeqGrabComponent seqGrab, SGChannel sgchanVideo, const int showDialog); #ifdef __cplusplus --- 36,40 ---- #endif ! OSStatus RequestSGSettings(const int inputIndex, SeqGrabComponent seqGrab, SGChannel sgchanVideo, const int showDialog, const int standardDialog); #ifdef __cplusplus |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:51:26
|
Update of /cvsroot/artoolkit/artoolkit/util/graphicsTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5735 Modified Files: graphicsTest-Info.plist Log Message: Update version for release. Index: graphicsTest-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/graphicsTest/graphicsTest-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** graphicsTest-Info.plist 29 Jul 2005 19:56:29 -0000 1.1 --- graphicsTest-Info.plist 18 Jun 2006 22:51:23 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:51:22
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5711 Modified Files: calib_dist-Info.plist Log Message: Update version for release. Index: calib_dist-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calib_dist-Info.plist 12 Aug 2005 21:55:44 -0000 1.1 --- calib_dist-Info.plist 18 Jun 2006 22:51:17 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:51:14
|
Update of /cvsroot/artoolkit/artoolkit/examples/multi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5675 Modified Files: multiTest-Info.plist Log Message: Update version for release. Index: multiTest-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/multi/multiTest-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** multiTest-Info.plist 29 Jul 2005 17:56:23 -0000 1.1 --- multiTest-Info.plist 18 Jun 2006 22:51:10 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:50:47
|
Update of /cvsroot/artoolkit/artoolkit/examples/loadMultiple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304 Modified Files: loadMultiple-Info.plist Log Message: Update version for release. Index: loadMultiple-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/loadMultiple/loadMultiple-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** loadMultiple-Info.plist 29 Jul 2005 17:55:52 -0000 1.1 --- loadMultiple-Info.plist 18 Jun 2006 22:50:44 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:50:40
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5292 Modified Files: simpleVRML-Info.plist Log Message: Update version for release. Index: simpleVRML-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** simpleVRML-Info.plist 29 Jul 2005 19:31:31 -0000 1.1 --- simpleVRML-Info.plist 18 Jun 2006 22:50:36 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:50:32
|
Update of /cvsroot/artoolkit/artoolkit/examples/exview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5271 Modified Files: exview-Info.plist Log Message: Update version for release. Index: exview-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/exview/exview-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** exview-Info.plist 29 Jul 2005 00:44:39 -0000 1.1 --- exview-Info.plist 18 Jun 2006 22:50:30 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
|
From: Philip L. <phi...@us...> - 2006-06-18 22:50:26
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5259 Modified Files: calib_camera2-Info.plist Log Message: Update version for release. Index: calib_camera2-Info.plist =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2-Info.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calib_camera2-Info.plist 12 Aug 2005 23:17:11 -0000 1.1 --- calib_camera2-Info.plist 18 Jun 2006 22:50:23 -0000 1.2 *************** *** 16,20 **** <string>????</string> <key>CFBundleVersion</key> ! <string>2.71</string> </dict> </plist> --- 16,20 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>2.71.3</string> </dict> </plist> |
