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

enforce the type specified in the table (AFL)

Browse Source
This commit is contained in:
Marcus Meissner
2016-03-04 19:58:30 +01:00
parent 24e562befa
commit 4d253eaee0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
camlibs/ptp2/config.c
View File

@@ -7223,6 +7223,11 @@ _get_config (Camera *camera, const char *confname, CameraWidget **outwidget, Cam
GP_LOG_D ("Getting property '%s' / 0x%04x", cursub->label, cursub->propid );
memset(&dpd,0,sizeof(dpd));
C_PTP (ptp_generic_getdevicepropdesc(params,cursub->propid,&dpd));
if (cursub->type != dpd.DataType) {
GP_LOG_E ("Type of property '%s' expected: 0x%04x got: 0x%04x", cursub->label, cursub->type, dpd.DataType );
ptp_free_devicepropdesc(&dpd);
continue;
}
ret = cursub->getfunc (camera, &widget, cursub, &dpd);
if ((ret == GP_OK) && (dpd.GetSet == PTP_DPGS_Get))
gp_widget_set_readonly (widget, 1);
@@ -7587,6 +7592,11 @@ _set_config (Camera *camera, const char *confname, CameraWidget *window, GPConte
memset(&dpd,0,sizeof(dpd));
ptp_generic_getdevicepropdesc(params,cursub->propid,&dpd);
if (cursub->type != dpd.DataType) {
GP_LOG_E ("Type of property '%s' expected: 0x%04x got: 0x%04x", cursub->label, cursub->type, dpd.DataType );
ptp_free_devicepropdesc(&dpd);
continue;
}
if (dpd.GetSet == PTP_DPGS_GetSet) {
ret = cursub->putfunc (camera, widget, &propval, &dpd);
} else {