darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle missing register 4 gracefully for nikon coolpix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14341 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2013-04-13 14:14:05 +00:00
parent ab45921ea8
commit d4f0fd053e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
camlibs/sierra/library.c
View File

@@ -591,7 +591,7 @@ sierra_read_packet (Camera *camera, unsigned char *packet, GPContext *context)
/* Those are all single byte packets. */
sierra_clear_usb_halt(camera);
GP_DEBUG ("Packet read. Returning GP_OK.");
GP_DEBUG ("Packet type 0x%02x read. Returning GP_OK.", packet[0]);
return GP_OK;
case SIERRA_PACKET_DATA:
@@ -1392,7 +1392,10 @@ sierra_capture (Camera *camera, CameraCaptureType type,
* current picture.
*/
GP_DEBUG ("Getting picture number.");
CHECK (sierra_get_int_register (camera, 4, &n, context));
r = sierra_get_int_register (camera, 4, &n, context);
if (r == GP_OK) {
GP_DEBUG ("Getting filename of file %i.", n);
}
/*
* We need to tell the frontend where the new image can be
* found. Unfortunatelly, we can only figure out the
@@ -1404,8 +1407,10 @@ sierra_capture (Camera *camera, CameraCaptureType type,
*
* Not that some cameras that don't support filenames will
* return 8 blanks instead of reporting an error.
*
* Some newer cameras (Nikon*) do not return register 4, so
* ignore errors from that.
*/
GP_DEBUG ("Getting filename of file %i.", n);
CHECK (sierra_get_string_register (camera, 79, 0, NULL,
filename, &len, context));
if ((len <= 0) || !strcmp (filename, " "))