From 6c15386537217be0e97edc1aed00f906e694d405 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Wed, 20 Jul 2022 17:10:37 +0800
Subject: [PATCH] =?UTF-8?q?linux=E4=B8=8A=E5=A2=9E=E5=8A=A0HGScannerLib?=
=?UTF-8?q?=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build.sh | 34 ++-
build/linux/HGScannerLib/HGScannerLib.cbp | 272 ++++++++++++++++++++++
build/linux/HGVersion/HGVersion.cbp | 1 +
build/linux/default.workspace | 6 +
sdk/scannerlib/HGScannerLib.cpp | 4 +-
5 files changed, 309 insertions(+), 8 deletions(-)
create mode 100644 build/linux/HGScannerLib/HGScannerLib.cbp
diff --git a/build.sh b/build.sh
index c849e0aa..5852bdb3 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
-if [ "$1" != "hg" ] && [ "$1" != "lsc" ] && [ "$1" != "hw" ] && [ "$1" != ""hgweb ] && [ "$1" != ""lscweb ] && [ "$1" != ""hwweb ];
+if [ "$1" != "hg" ] && [ "$1" != "lsc" ] && [ "$1" != "hw" ] && [ "$1" != "hgweb" ] && [ "$1" != "lscweb" ] && [ "$1" != "hwweb" ] && [ "$1" != "hgso" ] && [ "$1" != "lscso" ] && [ "$1" != "hwso" ];
then
echo "APP脚本参数错误！！！"
- echo "参数:华高:hg || hgweb 立思层:lsc || lscweb 汉王:hw || hwweb"
+ echo "参数:华高:hg || hgweb || hgso 立思层:lsc || lscweb || lscso 汉王:hw || hwweb || hwso"
exit 1
fi
@@ -31,10 +31,10 @@ echo ${system}
prefix="HG"
prefix2="hg"
-if [ "${1}" == "hw" ] || [ "${1}" == "hwweb" ]; then
+if [ "${1}" == "hw" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "hwso" ]; then
prefix="Hw"
prefix2="hw"
-elif [ "${1}" == "lsc" ] || [ "${1}" == "lscweb" ]; then
+elif [ "${1}" == "lsc" ] || [ "${1}" == "lscweb" ] || [ "${1}" == "lscso" ]; then
prefix="Lsc"
prefix2="lsc"
fi
@@ -107,14 +107,36 @@ if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ]; the
rm -rf obj
rm HGWebServiceTmp.cbp
+elif [ "${1}" == "hgso" ] || [ "${1}" == "hwso" ] || [ "${1}" == "lscso" ]; then
+
+ cd ../HGScannerLib
+ cp HGScannerLib.cbp HGScannerLibTmp.cbp
+ sed -i "s/release\/${system}\/${arch}\/HGScannerLib/release\/${system}\/${arch}\/${prefix}ScannerLib/g" HGScannerLibTmp.cbp
+ if [ "${1}" == "hwso" ]; then
+ sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGScannerLibTmp.cbp
+ elif [ "${1}" == "lscso" ]; then
+ sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScannerLibTmp.cbp
+ fi
+ sed -i "s/-lHGBase/-l${prefix}Base/g" HGScannerLibTmp.cbp
+ sed -i "s/-lHGImgFmt/-l${prefix}ImgFmt/g" HGScannerLibTmp.cbp
+ sed -i "s/-lHGImgProc/-l${prefix}ImgProc/g" HGScannerLibTmp.cbp
+ sed -i "s/-lsane-hgsane/-lsane-${prefix2}sane/g" HGScannerLibTmp.cbp
+ sed -i "s/-lhgdriver/-l${prefix2}driver/g" HGScannerLibTmp.cbp
+ cbp2make -targets ${system}_${arch}_Release -in HGScannerLibTmp.cbp -out makefile
+ make -j6
+ mv ../../../../release/${system}/${arch}/${prefix}ScannerLib.so ../../../../release/${system}/${arch}/lib${prefix}ScannerLib.so
+ rm -f Makefile
+ rm -rf obj
+ rm HGScannerLibTmp.cbp
+
else #APP
cd ../HGVersion
cp HGVersion.cbp HGVersionTmp.cbp
sed -i "s/release\/${system}\/${arch}\/HGVersion/release\/${system}\/${arch}\/${prefix}Version/g" HGVersionTmp.cbp
- if [ "${1}" == "hwweb" ]; then
+ if [ "${1}" == "hw" ]; then
sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGVersionTmp.cbp
- elif [ "${1}" == "lscweb" ]; then
+ elif [ "${1}" == "lsc" ]; then
sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGVersionTmp.cbp
fi
sed -i "s/-lHGBase/-l${prefix}Base/g" HGVersionTmp.cbp
diff --git a/build/linux/HGScannerLib/HGScannerLib.cbp b/build/linux/HGScannerLib/HGScannerLib.cbp
new file mode 100644
index 00000000..55a9ed0a
--- /dev/null
+++ b/build/linux/HGScannerLib/HGScannerLib.cbp
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/linux/HGVersion/HGVersion.cbp b/build/linux/HGVersion/HGVersion.cbp
index c37712be..cb4c3c11 100644
--- a/build/linux/HGVersion/HGVersion.cbp
+++ b/build/linux/HGVersion/HGVersion.cbp
@@ -245,6 +245,7 @@
+
diff --git a/build/linux/default.workspace b/build/linux/default.workspace
index 155a45d8..85e6ef68 100644
--- a/build/linux/default.workspace
+++ b/build/linux/default.workspace
@@ -21,6 +21,7 @@
+
@@ -28,5 +29,10 @@
+
+
+
+
+
diff --git a/sdk/scannerlib/HGScannerLib.cpp b/sdk/scannerlib/HGScannerLib.cpp
index 9dade41e..91441995 100644
--- a/sdk/scannerlib/HGScannerLib.cpp
+++ b/sdk/scannerlib/HGScannerLib.cpp
@@ -2,7 +2,7 @@
#include "base/HGInc.h"
#include "base/HGImage.h"
#include "imgfmt/HGImgFmt.h"
-#include "imgproc/HGOcr.h"
+#include "imgproc/HGOCR.h"
#include "HGString.h"
#include "HGLibDeviceImpl.hpp"
@@ -188,4 +188,4 @@ HGBool HGAPI HGLib_StopDeviceScan(HGLibDevice device)
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
return deviceImpl->StopScan();
-}
\ No newline at end of file
+}