[gphoto-cvs] libgphoto2/camlibs/canon util.c,1.26,1.27

[Stephen H. W. <sw...@us...>]

Update of /cvsroot/gphoto/libgphoto2/camlibs/canon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9895

Modified Files:
	util.c 
Log Message:
Allow ".CR2" as an image file, for 20D and other new cameras.


Index: util.c
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/util.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- util.c	25 Feb 2003 20:30:52 -0000	1.26
+++ util.c	31 Mar 2005 17:11:10 -0000	1.27
@@ -96,9 +96,9 @@
 
 	pos = strchr (name, '.');
 	if (pos) {
-		res = (!strcmp (pos, ".JPG"));
-		if (!res)
-			res = (!strcmp (pos, ".CRW"));
+		res |= !strcmp (pos, ".JPG");
+		res |= !strcmp (pos, ".CRW");
+		res |= !strcmp (pos, ".CR2");
 	}
 
 	GP_DEBUG ("is_image(%s) == %i", name, res);