diff --git a/.vs/hugaotwainds/v16/.suo b/.vs/hugaotwainds/v16/.suo new file mode 100644 index 0000000..09c759f Binary files /dev/null and b/.vs/hugaotwainds/v16/.suo differ diff --git a/.vs/hugaotwainds/v16/Browse.VC.db b/.vs/hugaotwainds/v16/Browse.VC.db new file mode 100644 index 0000000..fdbdd59 Binary files /dev/null and b/.vs/hugaotwainds/v16/Browse.VC.db differ diff --git a/.vs/hugaotwainds/v16/Browse.VC.db-shm b/.vs/hugaotwainds/v16/Browse.VC.db-shm new file mode 100644 index 0000000..00d94d0 Binary files /dev/null and b/.vs/hugaotwainds/v16/Browse.VC.db-shm differ diff --git a/.vs/hugaotwainds/v16/Browse.VC.db-wal b/.vs/hugaotwainds/v16/Browse.VC.db-wal new file mode 100644 index 0000000..e69de29 diff --git a/.vs/hugaotwainds/v16/ipch/3ced2958ccdf13c5.ipch b/.vs/hugaotwainds/v16/ipch/3ced2958ccdf13c5.ipch new file mode 100644 index 0000000..10ec733 Binary files /dev/null and b/.vs/hugaotwainds/v16/ipch/3ced2958ccdf13c5.ipch differ diff --git a/.vs/hugaotwainds/v16/ipch/41528721e592fb6d.ipch b/.vs/hugaotwainds/v16/ipch/41528721e592fb6d.ipch new file mode 100644 index 0000000..eef3c06 Binary files /dev/null and b/.vs/hugaotwainds/v16/ipch/41528721e592fb6d.ipch differ diff --git a/.vs/hugaotwainds/v16/ipch/AutoPCH/df6e74912cce6966/DLLMODUL.ipch b/.vs/hugaotwainds/v16/ipch/AutoPCH/df6e74912cce6966/DLLMODUL.ipch new file mode 100644 index 0000000..15cebf6 Binary files /dev/null and b/.vs/hugaotwainds/v16/ipch/AutoPCH/df6e74912cce6966/DLLMODUL.ipch differ diff --git a/hugaotwainds/CScanner_FreeImage.cpp b/hugaotwainds/CScanner_FreeImage.cpp index 11036cb..e9a35e8 100644 --- a/hugaotwainds/CScanner_FreeImage.cpp +++ b/hugaotwainds/CScanner_FreeImage.cpp @@ -896,21 +896,21 @@ void CScanner_FreeImage::UpdateList(bool canUpdate/*=true*/) if (m_wRotation!=0||m_bBackRotate180) { - //m_iaList.push_back(shared_ptr(new CImageRotation(m_wRotation,m_bBackRotate180))); - - CImageApplyRotation::RotationType type; - if (m_wRotation > 89.0f && m_wRotation < 91.0f) - type = CImageApplyRotation::RotationType::Rotate_90_clockwise; - else if (m_wRotation > 269.0f && m_wRotation < 271.0f) - type = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise; - else if (m_wRotation > 179.0f && m_wRotation < 181.0f) - type = CImageApplyRotation::RotationType::Rotate_180; - else - type = CImageApplyRotation::RotationType::Invalid; + m_iaList.push_back(shared_ptr(new CImageApplyRotation((CImageApplyRotation::RotationType)m_wRotation,m_bBackRotate180, m_fXResolution, "C:/Windows/twain_32/HuaGoScan/tessdata/"))); + //CImageApplyRotation::RotationType type; + //if (m_wRotation > 89.0f && m_wRotation < 91.0f) + // type = CImageApplyRotation::RotationType::Rotate_90_clockwise; + //else if (m_wRotation > 269.0f && m_wRotation < 271.0f) + // type = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise; + //else if (m_wRotation > 179.0f && m_wRotation < 181.0f) + // type = CImageApplyRotation::RotationType::Rotate_180; + //else + // type = CImageApplyRotation::RotationType::Invalid; + //if (is_autotext) //type = CImageApplyRotation::RotationType::AutoTextOrientation; - m_iaList.push_back(shared_ptr(new CImageApplyRotation(type, m_bBackRotate180, m_fXResolution, "C:/Windows/twain_32/HuaGoScan/tessdata/"))); + //m_iaList.push_back(shared_ptr(new CImageApplyRotation(type, m_bBackRotate180, m_fXResolution, "C:/Windows/twain_32/HuaGoScan/tessdata/"))); } } diff --git a/hugaotwainds/CTWAINDS_FreeImage.cpp b/hugaotwainds/CTWAINDS_FreeImage.cpp index 5ed0c51..052af0d 100644 --- a/hugaotwainds/CTWAINDS_FreeImage.cpp +++ b/hugaotwainds/CTWAINDS_FreeImage.cpp @@ -95,11 +95,11 @@ TW_IDENTITY CTWAINDS_Base::m_TheIdentity = #ifdef __APPLE__ "\p" #endif - "HuaGoScan", // TW_STR32 Manufacturer; Manufacturer name, e.g. "Hewlett-Packard" + "HUAGOSCAN", // TW_STR32 Manufacturer; Manufacturer name, e.g. "Hewlett-Packard" #ifdef __APPLE__ "\p" #endif - "HuaGoScan Hi Series", // TW_STR32 ProductFamily; Product family name, e.g. "ScanJet" + "HUAGOSCAN Hi Series", // TW_STR32 ProductFamily; Product family name, e.g. "ScanJet" #ifdef __APPLE__ "\p" #endif @@ -107,11 +107,11 @@ TW_IDENTITY CTWAINDS_Base::m_TheIdentity = - "HuaGoScan Hi-5100 TWAIN" // TW_STR32 ProductName; Product name, e.g. "ScanJet Plus" + "HUAGOSCAN Hi-2800 TWAIN" // TW_STR32 ProductName; Product name, e.g. "ScanJet Plus" #elif defined G300 - "HuaGoScan G300 TWAIN" + "HUAGOSCAN G300 TWAIN" #elif defined G400 - "HuaGoScan G400 TWAIN" + "HUAGOSCAN G400 TWAIN" //"ZhibenScan XS8100 TWAIN" #endif // G200 }; diff --git a/hugaotwainds/ImageMatQueue.cpp b/hugaotwainds/ImageMatQueue.cpp index 36baaf2..d720154 100644 --- a/hugaotwainds/ImageMatQueue.cpp +++ b/hugaotwainds/ImageMatQueue.cpp @@ -117,6 +117,7 @@ void ImageMatQueue::proc() qqImgB = IplImage(mats[1]); // cv::Mat -> IplImage cvSaveImage(csImageB, &qqImgB); #endif // LOG + std::swap(mats[0], mats[1]); for (int j = 0; j < m_iaList.size(); j++) { m_iaList[j]->apply(mats, duplexFlag);//ÐèÒªÔÚÿ¸öͼÏñ´¦ÀíapplyµÄ²¿·Ö Ôö¼ÓÅжÏÀï±ßµÄmatÊÇ·ñΪ¿Õ Ä¿Ç°»¹Ã»¼Ó @@ -130,14 +131,14 @@ void ImageMatQueue::proc() break; } #ifdef LOG - CString csImage; - csImage.Format("d:\\calc\\%d.jpg", (++num)); - IplImage qqImg; - qqImg = IplImage(mats[i]); // cv::Mat -> IplImage - cvSaveImage(csImage, &qqImg); + //CString csImage; + //csImage.Format("d:\\calc\\%d.jpg", (++num)); + //IplImage qqImg; + //qqImg = IplImage(mats[i]); // cv::Mat -> IplImage + //cvSaveImage(csImage, &qqImg); #endif // LOG - - m_images.push(mats[i]); + if(!mats[i].empty()) + m_images.push(mats[i]); if (can_multi_outputR) { ImageMultiOutput m_mlt; diff --git a/hugaotwainds/hugaotwainds.vcxproj.user b/hugaotwainds/hugaotwainds.vcxproj.user index 3320268..74d2c58 100644 --- a/hugaotwainds/hugaotwainds.vcxproj.user +++ b/hugaotwainds/hugaotwainds.vcxproj.user @@ -1,8 +1,8 @@  - C:\Program Files %28x86%29\TWAIN Working Group\TWAIN 2.3 App Sample\TWAIN_App_mfc32.exe - C:\Windows\twain_32\ZhibenScan + C:\Program Files %28x86%29\XnView\xnview.exe + ..\..\..\..\..\Windows\twain_32\ZhibenScan WindowsLocalDebugger diff --git a/hugaotwainds/stdafx.h b/hugaotwainds/stdafx.h index a36bbc5..6915117 100644 Binary files a/hugaotwainds/stdafx.h and b/hugaotwainds/stdafx.h differ