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

test if we reached the bottom or top of the enumeration in

Browse Source 
search for the new value to be set. If we reeach it and it
is not set yet, exit the loop.

Fixes e.g. ISO=25 being returned by the Sony, but it will
be skipped during the setting.

fixes https://github.com/gphoto/libgphoto2/issues/124
This commit is contained in:
Marcus Meissner
2017-01-03 17:29:02 +01:00
parent 99dceba032
commit 0bdd77da97
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
camlibs/ptp2/config.c
View File

@@ -1329,7 +1329,7 @@ _put_sony_value_##bits (PTPParams*params, uint16_t prop, inttype value,int useen
do { \
origval = dpd.CurrentValue.bits; \
/* if it is a ENUM, the camera will walk through the ENUM */ \
if (useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration)) { \
if (useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration)) { \
int i, posorig = -1, posnew = -1; \
\
for (i=0;i<dpd.FORM.Enum.NumberOfValues;i++) { \
@@ -1387,6 +1387,32 @@ _put_sony_value_##bits (PTPParams*params, uint16_t prop, inttype value,int useen
GP_LOG_D ("value did not change (0x%x vs 0x%x vs target 0x%x), not good ...", dpd.CurrentValue.bits, origval, value);\
break; \
} \
/* We did not get there. Did we hit 0? */ \
if (useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration)) { \
int i, posnow = -1; \
\
for (i=0;i<dpd.FORM.Enum.NumberOfValues;i++) { \
if (dpd.CurrentValue.bits == dpd.FORM.Enum.SupportedValue[i].bits) { \
posnow = i; \
break; \
} \
} \
if (posnow == -1) { \
gp_context_error (context, _("Now value is not in enumeration."));\
return GP_ERROR_BAD_PARAMETERS; \
} \
GP_LOG_D("posnow %d, value %d", posnow, dpd.CurrentValue.bits); \
if ((posnow == 0) && (propval.u8 == 0xff)) { \
gp_context_error (context, _("Sony was not able to set the new value, is it valid?")); \
GP_LOG_D ("hit bottom of enumeration, not good."); \
return GP_ERROR; \
} \
if ((posnow == dpd.FORM.Enum.NumberOfValues-1) && (propval.u8 == 0x01)) { \
GP_LOG_D ("hit top of enumeration, not good."); \
gp_context_error (context, _("Sony was not able to set the new value, is it valid?")); \
return GP_ERROR; \
} \
} \
} while (1); \
return GP_OK; \
}