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 35c0091d..2b2c9265 100644 Binary files a/huagao/stdafx.h and b/huagao/stdafx.h differ 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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() 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