Update of /cvsroot/gphoto/libgphoto2/camlibs/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv12446
Modified Files:
canon.c canon.h
Log Message:
compiling is a part of testing...
Index: canon.c
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- canon.c 25 Feb 2003 20:30:45 -0000 1.194
+++ canon.c 26 Feb 2003 22:48:52 -0000 1.195
@@ -164,9 +164,10 @@
#define extra_file_for_thumb_of_jpeg FALSE
#define extra_file_for_thumb_of_crw TRUE
-const char *
+static const char *
replace_filename_extension(const char *filename, const char *newext)
{
+ char *p;
static char buf[1024];
/* We just replace file ending by .THM and assume this is the
@@ -211,11 +212,8 @@
const char *
canon_int_filename2audioname (Camera *camera, const char *filename)
{
- char *p;
- static char *nullstring = "";
-
/* FIXME: I want capabilities */
- switch camera->pl->model {
+ switch (camera->pl->md->model) {
case CANON_PS_S30:
case CANON_PS_S40:
case CANON_PS_S45:
@@ -273,7 +271,6 @@
const char *
canon_int_filename2thumbname (Camera *camera, const char *filename)
{
- char *p;
static char *nullstring = "";
/* First handle cases where we shouldn't try to get extra .THM
Index: canon.h
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- canon.h 14 Feb 2003 17:24:31 -0000 1.65
+++ canon.h 26 Feb 2003 22:48:55 -0000 1.66
@@ -459,6 +459,7 @@
const char *gphoto2canonpath(Camera *camera, const char *path, GPContext *context);
const char *canon_int_filename2thumbname (Camera *camera, const char *filename);
+const char *canon_int_filename2audioname (Camera *camera, const char *filename);
int canon_int_extract_jpeg_thumb (unsigned char *data, const unsigned int datalen, unsigned char **retdata, unsigned int *retdatalen, GPContext *context);
|