Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
ad221c136c
|
@ -40,6 +40,7 @@ HGLib_StopDeviceScan
|
||||||
HGLib_StopDeviceScanAsyn
|
HGLib_StopDeviceScanAsyn
|
||||||
HGLib_GetDeviceOperateCode
|
HGLib_GetDeviceOperateCode
|
||||||
HGLib_GetDevicePageId
|
HGLib_GetDevicePageId
|
||||||
|
HGLib_SetOriginalImage
|
||||||
|
|
||||||
Java_com_easing_java_HGScannerLib_LoadImage
|
Java_com_easing_java_HGScannerLib_LoadImage
|
||||||
Java_com_easing_java_HGScannerLib_SaveImage
|
Java_com_easing_java_HGScannerLib_SaveImage
|
||||||
|
|
|
@ -467,7 +467,13 @@ HGBool HGLibDeviceImpl::SetDeviceToken(const HGChar* code)
|
||||||
if (NULL == code)
|
if (NULL == code)
|
||||||
return HGFALSE;
|
return HGFALSE;
|
||||||
|
|
||||||
SetValueStr256(0x8116, code);
|
return SetValueStr256(0x8116, code);
|
||||||
|
}
|
||||||
|
|
||||||
|
HGBool HGLibDeviceImpl::SetOriginalImage(HGBool isOriginal)
|
||||||
|
{
|
||||||
|
assert(NULL != m_devHandle);
|
||||||
|
return SetValueInt32(0x886F, isOriginal);
|
||||||
}
|
}
|
||||||
|
|
||||||
HGBool HGLibDeviceImpl::SetParam(HGUInt option, const HGVoid* data)
|
HGBool HGLibDeviceImpl::SetParam(HGUInt option, const HGVoid* data)
|
||||||
|
|
|
@ -30,6 +30,7 @@ public:
|
||||||
HGInt GetTotalCount();
|
HGInt GetTotalCount();
|
||||||
HGBool ClearRollerCount();
|
HGBool ClearRollerCount();
|
||||||
HGBool SetDeviceToken(const HGChar* code);
|
HGBool SetDeviceToken(const HGChar* code);
|
||||||
|
HGBool SetOriginalImage(HGBool isOriginal);
|
||||||
HGBool SetParam(HGUInt option, const HGVoid* data);
|
HGBool SetParam(HGUInt option, const HGVoid* data);
|
||||||
HGLibDeviceParamGroup* GetParamGroupList(HGUInt* count);
|
HGLibDeviceParamGroup* GetParamGroupList(HGUInt* count);
|
||||||
HGLibDeviceParam* GetParam(HGUInt option);
|
HGLibDeviceParam* GetParam(HGUInt option);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "HGScannerLib.h"
|
#include "HGScannerLib.h"
|
||||||
#include "base/HGInc.h"
|
#include "base/HGInc.h"
|
||||||
#include "base/HGImage.h"
|
#include "base/HGImage.h"
|
||||||
#include "imgfmt/HGImgFmt.h"
|
#include "imgfmt/HGImgFmt.h"
|
||||||
|
@ -489,3 +489,14 @@ HGBool HGAPI HGLib_SetDeviceToken(HGLibDevice device, const HGChar *code)
|
||||||
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
|
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
|
||||||
return deviceImpl->SetDeviceToken(code);
|
return deviceImpl->SetDeviceToken(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HGBool HGAPI HGLib_SetOriginalImage(HGLibDevice device, HGBool isOriginal)
|
||||||
|
{
|
||||||
|
if (NULL == device)
|
||||||
|
{
|
||||||
|
return HGFALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
|
||||||
|
return deviceImpl->SetOriginalImage(isOriginal);
|
||||||
|
}
|
||||||
|
|
|
@ -649,6 +649,9 @@ HGEXPORT HGBool HGAPI HGLib_ClearDeviceRollerCount(HGLibDevice device);
|
||||||
/* 设置设备锁定令牌 */
|
/* 设置设备锁定令牌 */
|
||||||
HGEXPORT HGBool HGAPI HGLib_SetDeviceToken(HGLibDevice device, const HGChar *code);
|
HGEXPORT HGBool HGAPI HGLib_SetDeviceToken(HGLibDevice device, const HGChar *code);
|
||||||
|
|
||||||
|
/* 设置是否获取原图 */
|
||||||
|
HGEXPORT HGBool HGAPI HGLib_SetOriginalImage(HGLibDevice device, HGBool isOriginal);
|
||||||
|
|
||||||
/* 设置设备参数 */
|
/* 设置设备参数 */
|
||||||
HGEXPORT HGBool HGAPI HGLib_SetDeviceParam(HGLibDevice device, HGUInt option, const HGVoid *data);
|
HGEXPORT HGBool HGAPI HGLib_SetDeviceParam(HGLibDevice device, HGUInt option, const HGVoid *data);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue