Merge branch 'master' of http://192.168.10.5:8099/sane/code_device
This commit is contained in:
commit
48f5da3491
|
@ -605,7 +605,7 @@ std::string hg_scanner::setting_name_from(const char* n_or_id, int* id)
|
||||||
if (IS_PTR_NUMBER(n_or_id))
|
if (IS_PTR_NUMBER(n_or_id))
|
||||||
{
|
{
|
||||||
if (id)
|
if (id)
|
||||||
*id = (int)n_or_id;
|
*id = (long long)n_or_id;
|
||||||
|
|
||||||
if ((unsigned long)n_or_id < jsn_children_.size())
|
if ((unsigned long)n_or_id < jsn_children_.size())
|
||||||
return jsn_children_[(unsigned long)n_or_id];
|
return jsn_children_[(unsigned long)n_or_id];
|
||||||
|
|
Loading…
Reference in New Issue