mirror of http://192.168.1.51:8099/lmh188/twain3.0
Merge branch 'master' of https://gitee.com/huagaochina/twain3.0
This commit is contained in:
commit
e00095d470
|
@ -737,20 +737,21 @@ void GScanO1003399::imgproce(std::shared_ptr<std::vector<char>>& buff)
|
||||||
FileTools::writelog(log_DEBUG, "ͼÏñ½âÂëºÄʱ " + to_string(sw.elapsed_ms()));
|
FileTools::writelog(log_DEBUG, "ͼÏñ½âÂëºÄʱ " + to_string(sw.elapsed_ms()));
|
||||||
sw.reset();
|
sw.reset();
|
||||||
buffs.clear();
|
buffs.clear();
|
||||||
if (m_param.imageRotateDegree != 0.0 || m_param.is_backrotate180 || m_param.is_autotext)
|
if (m_param.is_autotext)
|
||||||
{
|
{
|
||||||
CImageApplyRotation::RotationType type;
|
CImageApplyRotation::RotationType type;
|
||||||
if (m_param.imageRotateDegree > 89.0f && m_param.imageRotateDegree < 91.0f)
|
/*if (m_param.imageRotateDegree > 89.0f && m_param.imageRotateDegree < 91.0f)
|
||||||
type = CImageApplyRotation::RotationType::Rotate_90_clockwise;
|
type = CImageApplyRotation::RotationType::Rotate_90_clockwise;
|
||||||
else if (m_param.imageRotateDegree > 269.0f && m_param.imageRotateDegree < 271.0f)
|
else if (m_param.imageRotateDegree > 269.0f && m_param.imageRotateDegree < 271.0f)
|
||||||
type = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise;
|
type = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise;
|
||||||
else if (m_param.imageRotateDegree > 179.0f && m_param.imageRotateDegree < 181.0f)
|
else if (m_param.imageRotateDegree > 179.0f && m_param.imageRotateDegree < 181.0f)
|
||||||
type = CImageApplyRotation::RotationType::Rotate_180;
|
type = CImageApplyRotation::RotationType::Rotate_180;
|
||||||
else
|
else*/
|
||||||
type = CImageApplyRotation::RotationType::Invalid;
|
|
||||||
|
|
||||||
if (m_param.is_autotext)
|
if (m_param.is_autotext)
|
||||||
type = CImageApplyRotation::RotationType::AutoTextOrientation;
|
type = CImageApplyRotation::RotationType::AutoTextOrientation;
|
||||||
|
else
|
||||||
|
type = CImageApplyRotation::RotationType::Invalid;//只处理自动文本方向识别 其他的不处理
|
||||||
|
|
||||||
TCHAR szIniFile[MAX_PATH] = { 0 };
|
TCHAR szIniFile[MAX_PATH] = { 0 };
|
||||||
SHGetSpecialFolderPath(NULL, szIniFile, CSIDL_WINDOWS, TRUE);
|
SHGetSpecialFolderPath(NULL, szIniFile, CSIDL_WINDOWS, TRUE);
|
||||||
|
|
Loading…
Reference in New Issue