Skip to content

Commit b71dcfe

Browse files
authored
puttext full-width characters (#135)
* puttext full-width characters * fix build with android ndk 27
1 parent 62dedb9 commit b71dcfe

File tree

6 files changed

+902
-81
lines changed

6 files changed

+902
-81
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
6767
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
6868
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/core/src/
69+
cp ../patches/fontface.html ./
6970
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
7071
rm -rf modules/highgui
7172
cp -r ../highgui modules/
@@ -140,6 +141,7 @@ jobs:
140141
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
141142
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
142143
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
144+
cp ../patches/fontface.html ./
143145
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
144146
rm -rf modules/highgui
145147
cp -r ../highgui modules/
@@ -211,6 +213,7 @@ jobs:
211213
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
212214
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
213215
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
216+
cp ../patches/fontface.html ./
214217
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
215218
rm -rf modules/highgui
216219
cp -r ../highgui modules/
@@ -249,6 +252,7 @@ jobs:
249252
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
250253
env:
251254
COMMON_CMAKE_OPTIONS: |
255+
-DCMAKE_POLICY_DEFAULT_CMP0057=NEW \
252256
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
253257
-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
254258
-DANDROID_PLATFORM=android-21 \

0 commit comments

Comments
 (0)