From 743492c565e4cd9bcbfa4dcece7c703e7d97946e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 25 Feb 2011 22:41:34 +0000 Subject: [PATCH] fixed capturetype bug, and renamed variable git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13544 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/kodak/dc120/dc120.c | 2 +- camlibs/kodak/dc120/library.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c index 0e8891c2a..d00ec01fb 100644 --- a/camlibs/kodak/dc120/dc120.c +++ b/camlibs/kodak/dc120/dc120.c @@ -286,7 +286,7 @@ static int camera_capture (Camera *camera, CameraCaptureType type, CameraFilePat int count; const char* name; - if (type != GP_OPERATION_CAPTURE_IMAGE) + if (type != GP_CAPTURE_IMAGE) return (GP_ERROR_NOT_SUPPORTED); /* capture a image to flash (note: we do not check if full */ diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index 9216e9766..4f7167b2c 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -285,10 +285,10 @@ int dc120_get_status (Camera *camera, Kodak_dc120_status *status, GPContext *con if( retval == (GP_OK) && status != NULL ) { const char *data; - long int size; + long int lsize; - gp_file_get_data_and_size( file, &data, &size ); - if( size<122 ) { + gp_file_get_data_and_size( file, &data, &lsize ); + if( lsize<122 ) { gp_file_free (file); free (p); return (GP_ERROR);