diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2002-11-17 16:48:39 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2002-11-17 16:48:39 +0000 |
| commit | eef6853c744baeff196f19c834af0eae4934be11 (patch) | |
| tree | c4d87f9129a8ded1d665c02103905261d30963a0 /camlibs/stv0680 | |
| parent | e668c630d6152487f877e6233ee1e6c29cc412c2 (diff) | |
| download | libgphoto2-eef6853c744baeff196f19c834af0eae4934be11.tar.gz | |
* stv0680.c: Fixed long*/int* cast and some warnings.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5628 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/stv0680')
| -rw-r--r-- | camlibs/stv0680/ChangeLog | 4 | ||||
| -rw-r--r-- | camlibs/stv0680/stv0680.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/camlibs/stv0680/ChangeLog b/camlibs/stv0680/ChangeLog index 88711e994..33d29086e 100644 --- a/camlibs/stv0680/ChangeLog +++ b/camlibs/stv0680/ChangeLog @@ -1,3 +1,7 @@ +2002-11-17 Marcus Meissner <marcus@jet.franken.de> + + * stv0680.c: Fixed long*/int* cast and some warnings. + 2002-10-03 Lutz Müller <lutz@users.sourceforge.net> * Makefile.am: -I$(top_builddir)/libgphoto2 diff --git a/camlibs/stv0680/stv0680.c b/camlibs/stv0680/stv0680.c index fe44c57c4..12a615a84 100644 --- a/camlibs/stv0680/stv0680.c +++ b/camlibs/stv0680/stv0680.c @@ -125,7 +125,7 @@ int camera_id (CameraText *id) int camera_abilities (CameraAbilitiesList *list) { CameraAbilities a; - int i; + unsigned int i; /* 10/11/01/cw rewritten to add cameras via array */ @@ -237,10 +237,9 @@ static int camera_capture (Camera *camera, CameraCaptureType type, CameraFilePat static int camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context) { char *data; - int result; - long int size; + int size, result; - result = stv0680_capture_preview (camera->port, &data, (int*) &size); + result = stv0680_capture_preview (camera->port, &data, &size); if (result < 0) return result; |