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

more shutterspeed specification parsing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12710 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2010-02-17 23:01:56 +00:00
parent 89bed6541f
commit ed83fc816c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
camlibs/ptp2/config.c
View File

@@ -2085,8 +2085,17 @@ _put_ExpTime(CONFIG_PUT_ARGS)
if (ret != GP_OK)
return ret;
if (!sscanf(value,_("%fs"),&val))
return (GP_ERROR);
if (!sscanf(value,_("%fs"),&val)) {
int ival1, ival2, ival3;
if (sscanf(value,_("%d/%d"),&ival1,&ival2) == 2) {
val = (float)ival1/(float)ival2;
} else if (sscanf(value,_("%d %d/%d"),&ival1,&ival2,&ival3) == 3) {
val = ((float)ival1) + ((float)ival2/(float)ival3);
} else if (!sscanf(value,"%f",&val)) {
return (GP_ERROR);
}
}
val = val*10000.0;
delta = 1000000;
xval = val;