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

linux上imgporc库添加对freetypede依赖

This commit is contained in:
luoliangyi 2022-06-14 15:05:22 +08:00
parent 80b67e2e2e
commit a8856d73d0
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build/linux/HGImgProc/HGImgProc.cbp
View File

@ -16,6 +16,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/uos/amd64/include" />
<Add directory="../../../third_party/freetype/uos/amd64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/amd64/include" />
</Compiler>
<Linker>
@ -26,6 +27,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/amd64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/uos_x86_64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/uos_x86_64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -42,6 +45,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/uos/amd64/include" />
<Add directory="../../../third_party/freetype/uos/amd64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/amd64/include" />
</Compiler>
<Linker>
@ -53,6 +57,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/amd64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/uos/x86_64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -68,6 +74,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/uos/aarch64/include" />
<Add directory="../../../third_party/freetype/uos/aarch64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/aarch64/include" />
</Compiler>
<Linker>
@ -78,6 +85,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/aarch64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/uos_aarch64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/uos_aarch64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -94,6 +103,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/uos/aarch64/include" />
<Add directory="../../../third_party/freetype/uos/aarch64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/aarch64/include" />
</Compiler>
<Linker>
@ -105,6 +115,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/aarch64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/uos/aarch64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -120,6 +132,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/uos/mips64/include" />
<Add directory="../../../third_party/freetype/uos/mips64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/mips64/include" />
</Compiler>
<Linker>
@ -129,6 +142,8 @@
<Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/mips64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/uos_mips64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/uos_mips64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -145,6 +160,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/uos/mips64/include" />
<Add directory="../../../third_party/freetype/uos/mips64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/uos/mips64/include" />
</Compiler>
<Linker>
@ -155,6 +171,8 @@
<Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/uos/mips64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/uos/mips64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -170,6 +188,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/kylin/amd64/include" />
<Add directory="../../../third_party/freetype/kylin/amd64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/amd64/include" />
</Compiler>
<Linker>
@ -180,6 +199,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/amd64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/kylin_x86_64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/kylin_x86_64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -196,6 +217,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/kylin/amd64/include" />
<Add directory="../../../third_party/freetype/kylin/amd64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/amd64/include" />
</Compiler>
<Linker>
@ -207,6 +229,8 @@
<Add option="-lopencv_core" />
<Add option="-littnotify" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/amd64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/kylin/x86_64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -222,6 +246,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/kylin/aarch64/include" />
<Add directory="../../../third_party/freetype/kylin/aarch64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/aarch64/include" />
</Compiler>
<Linker>
@ -233,6 +258,8 @@
<Add option="-littnotify" />
<Add option="-ltegra_hal" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/aarch64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/kylin_aarch64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/kylin_aarch64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -249,6 +276,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/kylin/aarch64/include" />
<Add directory="../../../third_party/freetype/kylin/aarch64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/aarch64/include" />
</Compiler>
<Linker>
@ -261,6 +289,8 @@
<Add option="-littnotify" />
<Add option="-ltegra_hal" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/aarch64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/kylin/aarch64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -276,6 +306,7 @@
<Compiler>
<Add option="-g" />
<Add directory="../../../third_party/opencv/kylin/mips64/include" />
<Add directory="../../../third_party/freetype/kylin/mips64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/mips64/include" />
</Compiler>
<Linker>
@ -285,6 +316,8 @@
<Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/mips64/lib" />
<Add option="-lfreetype" />
<Add option="-L../HGBase/bin/kylin_mips64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/kylin_mips64_Debug -lHGImgFmt" />
<Add option="-ldl" />
@ -301,6 +334,7 @@
<Compiler>
<Add option="-O2" />
<Add directory="../../../third_party/opencv/kylin/mips64/include" />
<Add directory="../../../third_party/freetype/kylin/mips64/include/freetype2" />
<Add directory="../../../third_party/ocr/hanvon/kylin/mips64/include" />
</Compiler>
<Linker>
@ -311,6 +345,8 @@
<Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" />
<Add option="-lzlib" />
<Add option="-L../../../third_party/freetype/kylin/mips64/lib" />
<Add option="-lfreetype" />
<Add option="-L../../../../release/kylin/mips64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" />
<Add option="-lpthread" />
@ -328,6 +364,8 @@
<Add option="-z defs" />
<Add option="-B direct" />
</Linker>
<Unit filename="../../../modules/imgproc/CvxText.cpp" />
<Unit filename="../../../modules/imgproc/CvxText.hpp" />
<Unit filename="../../../modules/imgproc/HGImgProc.cpp" />
<Unit filename="../../../modules/imgproc/HGImgProc.h" />
<Unit filename="../../../modules/imgproc/HGImgProcErr.h" />

8
modules/imgproc/HGImgProc.cpp
View File

@ -228,7 +228,7 @@ HGResult HGAPI HGImgProc_ImageAutoCrop(HGImage image, HGBool autoCrop, HGBool de
if (0 == destOrigin)
destOrigin = imgInfo.origin;
ret = HGImgProc_ImageAutoCrop(imageTmp, autoCrop, deskew, fillBlank, param,
ret = HGImgProc_ImageAutoCrop(imageTmp, autoCrop, deskew, fillBlank, param,
destWidth, destHeight, destType, destOrigin, destImage);
HGBase_DestroyImage(imageTmp);
}
@ -374,7 +374,7 @@ static HGResult MeasureString(const HGChar* text, HGInt x, HGInt y, const HGImgW
}
HGChar moduleName[256];
HGBase_GetModuleName(HGImgProc_AddImageWatermark, moduleName, 256);
HGBase_GetModuleName((void *)HGImgProc_AddImageWatermark, moduleName, 256);
HGChar modulePath[256];
HGBase_GetFilePath(moduleName, modulePath, 256);
HGChar fontPath[256];
@ -425,7 +425,7 @@ HGResult HGAPI HGImgProc_AddImageWatermark(HGImage image, const HGChar* text, HG
}
HGChar moduleName[256];
HGBase_GetModuleName(HGImgProc_AddImageWatermark, moduleName, 256);
HGBase_GetModuleName((void *)HGImgProc_AddImageWatermark, moduleName, 256);
HGChar modulePath[256];
HGBase_GetFilePath(moduleName, modulePath, 256);
HGChar fontPath[256];
@ -498,4 +498,4 @@ HGResult HGAPI HGImgProc_AddImageWatermark(HGImage image, const HGChar* text, HG
}
return HGImgProc_AddImageWatermark(image, text, color, HGIMGPROC_WMPOSTYPE_LOCATION, x, y, fontParam);
}
}

BIN
third_party/freetype/kylin/aarch64/lib/libfreetype.a vendored
View File

Binary file not shown.