Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30348
Modified Files:
video.c
Log Message:
Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also.
Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** video.c 18 Sep 2006 23:31:01 -0000 1.13
--- video.c 19 Sep 2006 03:13:10 -0000 1.14
***************
*** 288,292 ****
ARUint32 p1,p2;
quadlet_t value;
! char *config *a, line[256];
int i;
--- 288,292 ----
ARUint32 p1,p2;
quadlet_t value;
! char *config, *a, line[256];
int i;
***************
*** 315,319 ****
/* None suppplied, lets see if the user supplied one from the shell */
char *envconf = getenv ("ARTOOLKIT_CONFIG");
! if (envconf) {
config = envconf;
printf ("Using config string from environment [%s].\n", envconf);
--- 315,319 ----
/* None suppplied, lets see if the user supplied one from the shell */
char *envconf = getenv ("ARTOOLKIT_CONFIG");
! if (envconf && envconf[0]) {
config = envconf;
printf ("Using config string from environment [%s].\n", envconf);
|
