puttext full-width characters (#135)

* puttext full-width characters * fix build with android ndk 27
nihui · Aug 3, 2024 · b71dcfe · b71dcfe
1 parent 62dedb9
commit b71dcfe
Show file tree

Hide file tree

Showing 6 changed files with 902 additions and 81 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,6 +66,7 @@ jobs:
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/core/src/
+        cp ../patches/fontface.html ./
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
@@ -140,6 +141,7 @@ jobs:
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
+        cp ../patches/fontface.html ./
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
@@ -211,6 +213,7 @@ jobs:
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
+        cp ../patches/fontface.html ./
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
@@ -249,6 +252,7 @@ jobs:
         opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
     env:
       COMMON_CMAKE_OPTIONS: |
+        -DCMAKE_POLICY_DEFAULT_CMP0057=NEW \
         -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
         -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
         -DANDROID_PLATFORM=android-21 \