lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: lmh188:71953fe553136962f4d151ae3d519326565e30a4
Branches Tags
lmh188:master
lmh188:dev
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523
...
compare: lmh188:8a391f2c2faba3afca92f33c8ed43a9808bc035a
Branches Tags
lmh188:dev
lmh188:master
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523

2 Commits
71953fe553 ... 8a391f2c2f

Author SHA1 Message Date
luoliangyi 8a391f2c2f 中晶国产系统安装包名称修改 2023-03-16 19:06:20 +08:00
luoliangyi ce9fd642e6 imgproc图像处理模块输出cpu支持的指令集 2023-03-16 14:23:15 +08:00
3 changed files with 50 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
app/scanner/mainwindow.cpp
View File

@ -3202,7 +3202,7 @@ void MainWindow::on_act_help_triggered()
#elif defined(OEM_CANGTIAN)
filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf";
#elif defined(OEM_ZHONGJING)
filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf";
filename = "/opt/apps/com.microtekchina.microtekscan-ex/entries/help/MicrotekScan_App_Help_manual.pdf";
#elif defined(OEM_ZIGUANG)
filename = "/opt/apps/com.unischina.uniscan/entries/help/UniScan_App_Help_manual.pdf";
#else
@ -3218,7 +3218,7 @@ void MainWindow::on_act_help_triggered()
#elif defined(OEM_CANGTIAN)
filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
#elif defined(OEM_ZHONGJING)
filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf";
filename = "/opt/apps/scanner-driver-microtek-ex/doc/MicrotekScan_App_Help_manual.pdf";
#elif defined(OEM_ZIGUANG)
filename = "/opt/apps/scanner-driver-unis/doc/UniScan_App_Help_manual.pdf";
#else

8
app/upgrade/HGUpgrade.cpp
View File

@ -110,7 +110,7 @@ bool AppIsRun(const std::string& appName)
appPath = "/opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan";
#elif defined(OEM_ZHONGJING)
cmd = "ps -wef | grep MicrotekScan";
appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan";
appPath = "/opt/apps/com.microtekchina.microtekscan-ex/files/bin/MicrotekScan";
#elif defined(OEM_ZIGUANG)
cmd = "ps -wef | grep UniScan";
appPath = "/opt/apps/com.unischina.uniscan/files/bin/UniScan";
@ -132,7 +132,7 @@ bool AppIsRun(const std::string& appName)
appPath = "/opt/apps/scanner-driver-cumtenn/bin/CumtennScan";
#elif defined(OEM_ZHONGJING)
cmd = "ps -wef | grep MicrotekScan";
appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan";
appPath = "/opt/apps/scanner-driver-microtek-ex/bin/MicrotekScan";
#elif defined(OEM_ZIGUANG)
cmd = "ps -wef | grep UniScan";
appPath = "/opt/apps/scanner-driver-unis/bin/UniScan";
@ -231,7 +231,7 @@ void RunApp(const std::string& appName)
#elif defined(OEM_CANGTIAN)
appPath = "sh /opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan.sh &";
#elif defined(OEM_ZHONGJING)
appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &";
appPath = "sh /opt/apps/com.microtekchina.microtekscan-ex/files/bin/MicrotekScan.sh &";
#elif defined(OEM_ZIGUANG)
appPath = "sh /opt/apps/com.unischina.uniscan/files/bin/UniScan.sh &";
#else
@ -247,7 +247,7 @@ void RunApp(const std::string& appName)
#elif defined(OEM_CANGTIAN)
appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &";
#elif defined(OEM_ZHONGJING)
appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &";
appPath = "sh /opt/apps/scanner-driver-microtek-ex/bin/MicrotekScan.sh &";
#elif defined(OEM_ZIGUANG)
appPath = "sh /opt/apps/scanner-driver-unis/bin/UniScan.sh &";
#else

44
modules/imgproc/ImageProcess/ImageApply.cpp
View File

@ -2,7 +2,51 @@
CImageApply::CImageApply(void)
{
std::cout << "cv::useOptimized()：" << cv::useOptimized() << std::endl;
std::cout << "HardwareSupport(CV_CPU_MMX): " << cv::checkHardwareSupport(CV_CPU_MMX) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSE): " << cv::checkHardwareSupport(CV_CPU_SSE) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSE2): " << cv::checkHardwareSupport(CV_CPU_SSE2) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSE3): " << cv::checkHardwareSupport(CV_CPU_SSE3) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSSE3): " << cv::checkHardwareSupport(CV_CPU_SSSE3) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSE4_1): " << cv::checkHardwareSupport(CV_CPU_SSE4_1) << std::endl;
std::cout << "HardwareSupport(CV_CPU_SSE4_2): " << cv::checkHardwareSupport(CV_CPU_SSE4_2) << std::endl;
std::cout << "HardwareSupport(CV_CPU_POPCNT): " << cv::checkHardwareSupport(CV_CPU_POPCNT) << std::endl;
std::cout << "HardwareSupport(CV_CPU_FP16): " << cv::checkHardwareSupport(CV_CPU_FP16) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX): " << cv::checkHardwareSupport(CV_CPU_AVX) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX2): " << cv::checkHardwareSupport(CV_CPU_AVX2) << std::endl;
std::cout << "HardwareSupport(CV_CPU_FMA3): " << cv::checkHardwareSupport(CV_CPU_FMA3) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512F): " << cv::checkHardwareSupport(CV_CPU_AVX_512F) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512BW): " << cv::checkHardwareSupport(CV_CPU_AVX_512BW) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512CD): " << cv::checkHardwareSupport(CV_CPU_AVX_512CD) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512DQ): " << cv::checkHardwareSupport(CV_CPU_AVX_512DQ) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512ER): " << cv::checkHardwareSupport(CV_CPU_AVX_512ER) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512IFMA512): " << cv::checkHardwareSupport(CV_CPU_AVX_512IFMA512) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512IFMA): " << cv::checkHardwareSupport(CV_CPU_AVX_512IFMA) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512PF): " << cv::checkHardwareSupport(CV_CPU_AVX_512PF) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512VBMI): " << cv::checkHardwareSupport(CV_CPU_AVX_512VBMI) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512VL): " << cv::checkHardwareSupport(CV_CPU_AVX_512VL) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512VBMI2): " << cv::checkHardwareSupport(CV_CPU_AVX_512VBMI2) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512VNNI): " << cv::checkHardwareSupport(CV_CPU_AVX_512VNNI) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512BITALG): " << cv::checkHardwareSupport(CV_CPU_AVX_512BITALG) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_512VPOPCNTDQ): " << cv::checkHardwareSupport(CV_CPU_AVX_512VPOPCNTDQ) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_5124VNNIW): " << cv::checkHardwareSupport(CV_CPU_AVX_5124VNNIW) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX_5124FMAPS): " << cv::checkHardwareSupport(CV_CPU_AVX_5124FMAPS) << std::endl;
std::cout << "HardwareSupport(CV_CPU_NEON): " << cv::checkHardwareSupport(CV_CPU_NEON) << std::endl;
std::cout << "HardwareSupport(CV_CPU_MSA): " << cv::checkHardwareSupport(CV_CPU_MSA) << std::endl;
std::cout << "HardwareSupport(CV_CPU_VSX): " << cv::checkHardwareSupport(CV_CPU_VSX) << std::endl;
std::cout << "HardwareSupport(CV_CPU_VSX3): " << cv::checkHardwareSupport(CV_CPU_VSX3) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_SKX): " << cv::checkHardwareSupport(CV_CPU_AVX512_SKX) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_COMMON): " << cv::checkHardwareSupport(CV_CPU_AVX512_COMMON) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_KNL): " << cv::checkHardwareSupport(CV_CPU_AVX512_KNL) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_KNM): " << cv::checkHardwareSupport(CV_CPU_AVX512_KNM) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_CNL): " << cv::checkHardwareSupport(CV_CPU_AVX512_CNL) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_CLX): " << cv::checkHardwareSupport(CV_CPU_AVX512_CLX) << std::endl;
std::cout << "HardwareSupport(CV_CPU_AVX512_ICL): " << cv::checkHardwareSupport(CV_CPU_AVX512_ICL) << std::endl;
cv::setUseOptimized(false);
std::cout << "cv::useOptimized()：" << cv::useOptimized() << std::endl;
}
CImageApply::~CImageApply(void)