From 58ea5064643ffdccf6828a637b68134cb92e630f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 19 Jan 2014 22:11:06 +0000 Subject: [PATCH] specify the ofcs on delete git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14722 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/library.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index fd7de7501..a3d627ee4 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -2753,7 +2753,7 @@ camera_olympus_xml_capture (Camera *camera, CameraCaptureType type, CameraFilePa int res; PTPParams *params = &camera->pl->params; - gp_log (GP_LOG_DEBUG, "ptp2/usb", "olympus capture\n"); + gp_log (GP_LOG_DEBUG, "ptp2/usb", "olympus capture"); ret = ptp_olympus_capture (params, 3); if (ret != PTP_RC_OK) @@ -2814,10 +2814,10 @@ camera_olympus_xml_capture (Camera *camera, CameraCaptureType type, CameraFilePa sprintf (path->name, "capt%04d.jpg", capcnt++); res = add_objectid_and_upload (camera, path, context, event.Param1, &oi); - ret = ptp_deleteobject (params, event.Param1, 0); + ret = ptp_deleteobject (params, event.Param1, PTP_OFC_EXIF_JPEG); if (ret != PTP_RC_OK) gp_log (GP_LOG_ERROR, "olympus", "capture 2: delete image %08x, ret 0x%04x", event.Param1, ret); - ret = ptp_deleteobject (params, assochandle, 0); + ret = ptp_deleteobject (params, assochandle, PTP_OFC_Association); if (ret != PTP_RC_OK) gp_log (GP_LOG_ERROR, "olympus", "capture 2: delete folder %08x, ret 0x%04x", assochandle, ret); return res;