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
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user