From 0aa4e0e025033740227fc78f9daa4f8e7bc4bef1 Mon Sep 17 00:00:00 2001
From: masayume <1936714878@qq.com>
Date: Wed, 6 Jul 2022 11:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7=E5=B0=BA?=
 =?UTF-8?q?=E5=AF=B8=E6=8B=89=E4=BC=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 huagao/CBasicPage.cpp           |   4 ++
 huagao/Device/ImageMatQueue.cpp |   2 +-
 huagao/stdafx.h                 | Bin 25538 -> 25534 bytes
 twpp/twpp.hpp                   | 114 ++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 twpp/twpp.hpp

diff --git a/huagao/CBasicPage.cpp b/huagao/CBasicPage.cpp
index e62cdbd8..11d3c45a 100644
--- a/huagao/CBasicPage.cpp
+++ b/huagao/CBasicPage.cpp
@@ -391,6 +391,8 @@ void CBasicPage::OnNMReleasedcaptureSliderdpi(NMHDR* pNMHDR, LRESULT* pResult)
 		((CButton*)GetDlgItem(IDC_RDQUALITYPRIORITY))->EnableWindow(TRUE);
 		((CButton*)GetDlgItem(IDC_RDSPEEDPRIORITY))->EnableWindow(TRUE);
 	}
+#ifndef ANDROIDSERIAL
+
 
 	if (((m_Slider_Dpi.m_iPosition > 300 && ((CButton*)GetDlgItem(IDC_RDQUALITYPRIORITY))->GetCheck()) ||
 		(m_Slider_Dpi.m_iPosition > 500 && ((CButton*)GetDlgItem(IDC_RDSPEEDPRIORITY))->GetCheck())) &&
@@ -426,6 +428,8 @@ void CBasicPage::OnNMReleasedcaptureSliderdpi(NMHDR* pNMHDR, LRESULT* pResult)
 		m_cmBoxSS->InsertString(22,_T("三联试卷"));
 #endif // G300
 	}
+
+#endif // !ANDROIDSERIAL
 	if (m_Slider_Dpi.m_iPosition > 300 && m_cmBoxDuplex->GetCount() > 4)
 	{
 		if (m_cmBoxDuplex->GetCurSel() == 4)
diff --git a/huagao/Device/ImageMatQueue.cpp b/huagao/Device/ImageMatQueue.cpp
index 96eadb4d..fcc0a91e 100644
--- a/huagao/Device/ImageMatQueue.cpp
+++ b/huagao/Device/ImageMatQueue.cpp
@@ -219,7 +219,7 @@ void ImageMatQueue::setparam(const GScanCap& param)
 	}
 
 	{
-		bool islongcustomcrop = (param.papertype == TwSS::USStatement || param.papertype == TwSS::MaxSize);
+		bool islongcustomcrop = param.papertype == TwSS::USStatement;// || param.papertype == TwSS::MaxSize);
 		//bool isautocrop = param.papertype == TwSS::None;
 		CSize fixedSize;
 #ifdef REAL300DPI
diff --git a/huagao/stdafx.h b/huagao/stdafx.h
index 35c0091da40ca28479ef30f21132e7599f81c960..2b2c9265794eb7410dac8a3bc2944f902acc032e 100644
GIT binary patch
delta 41
zcmV+^0M`G)#{s^_0kDJ!1v3CJ05Fp;O&OCEQWBG%3l6iw2qpoO-Ww3J{0YWcDLxK)

delta 37
tcmdmYobk|c#tkhTtVRq53<i^PIVC4w;ZfLph(nEWvLBbo<{zBLA_4ka4G#bS

diff --git a/twpp/twpp.hpp b/twpp/twpp.hpp
new file mode 100644
index 00000000..a3d95a12
--- /dev/null
+++ b/twpp/twpp.hpp
@@ -0,0 +1,114 @@
+/*
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Martin Richter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+#ifndef TWPP_DETAIL_FILE_TWPP_HPP
+#define TWPP_DETAIL_FILE_TWPP_HPP
+
+#include "twpp/env.hpp"
+
+#include <cstdint>
+#include <cstdlib>
+#include <initializer_list>
+#include <memory>
+#include <utility>
+#include <iterator>
+#include <type_traits>
+#include <limits>
+#include <stdexcept>
+#include <mutex>
+#include <condition_variable>
+#include <map>
+#include <string>
+#include <list>
+#include <cstring>
+#include <array>
+#include <utility>
+#include <cassert>
+
+#include "twpp/utils.hpp"
+
+#include "twpp/types.hpp"
+#include "twpp/strings.hpp"
+#include "twpp/fix32.hpp"
+#include "twpp/frame.hpp"
+#include "twpp/exception.hpp"
+#include "twpp/typesops.hpp"
+
+#include "twpp/memoryops.hpp"
+#include "twpp/memory.hpp"
+
+#include "twpp/enums.hpp"
+#include "twpp/status.hpp"
+#include "twpp/identity.hpp"
+#include "twpp/imageinfo.hpp"
+#include "twpp/imagelayout.hpp"
+#include "twpp/deviceevent.hpp"
+#include "twpp/element8.hpp"
+
+#include "twpp/audio.hpp"
+#include "twpp/capability.hpp"
+#include "twpp/customdata.hpp"
+#include "twpp/cie.hpp"
+#include "twpp/curveresponse.hpp"
+#include "twpp/event.hpp"
+#include "twpp/extimageinfo.hpp"
+#include "twpp/filesystem.hpp"
+#include "twpp/imagememxfer.hpp"
+#include "twpp/imagenativexfer.hpp"
+#include "twpp/internal.hpp"
+#include "twpp/jpegcompression.hpp"
+#include "twpp/palette8.hpp"
+#include "twpp/passthrough.hpp"
+#include "twpp/pendingxfers.hpp"
+#include "twpp/setupfilexfer.hpp"
+#include "twpp/setupmemxfer.hpp"
+#include "twpp/userinterface.hpp"
+
+#if !defined(TWPP_IS_DS)
+#   include "twpp/application.hpp"
+#else
+#   include "twpp/datasource.hpp"
+#endif
+
+
+#if !defined(TWPP_NO_NOTES)
+#   if !defined(TWPP_IS_DS)
+#       pragma message ("note: using APPLICATION version of TWPP library, define TWPP_IS_DS before including twpp.hpp if you want DATA SOURCE version")
+#       if defined(TWPP_DETAIL_OS_WIN32)
+#           pragma message ("note: place the following into your module-definition (.def) file: EXPORTS DS_Entry @1")
+#       endif
+#   else
+#       pragma message ("note: using DATA SOURCE version of TWPP library, undefine TWPP_IS_DS if you want APPLICATION version")
+#       pragma message ("note: make sure to place TWPP_ENTRY(<your-source-class-type>) macro in exactly one source file")
+#   endif
+#   if defined(TWPP_DETAIL_OS_MAC)
+#       pragma message "warning: Str32, Str64, Str128 and Str255 are not null-terminated"
+#   endif
+#   pragma message ("note: to disable notes and warnings, define TWPP_NO_NOTES before including TWPP header")
+#endif
+
+
+#endif // TWPP_DETAIL_FILE_TWPP_HPP