Merge pull request #22 from shimat/4.8

4.8

.github/workflows/windows.yml

@@ -5,7 +5,7 @@ on:
  types: [synchronize, opened]
 
 env:
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
 
 jobs:
  build:
@@ -36,12 +36,10 @@ jobs:
  uses: microsoft/[email protected]
 
  - name: Setup vcpkg
- uses: lukka/run-vcpkg@v10.0
+ uses: lukka/run-vcpkg@v11.1
  if: ${{ matrix.platform == 'win' }}
  with:
- # https:/shimat/vcpkg/commit/faed44dfa013088fe1910908a8a65887622f412f
- #vcpkgGitCommitId: 9502b2044d7fbe7a885f824f58e0b672e8b74886 
- vcpkgGitCommitId: faed44dfa013088fe1910908a8a65887622f412f
+ vcpkgGitCommitId: "64adda19c86e89526b5e27703a193c14477cce07"
  vcpkgGitURL: https:/shimat/vcpkg.git
 
  - name: Vcpkg

build_uwp.ps1

@@ -13,6 +13,13 @@ function BuildForUWP($platform, $vcpkgPath, $runMsbuild) {
  else {
  $msbuildPlatform = $platform # x64/ARM/ARM64
  }
+
+ if ($platform -eq "ARM") {
+ $withOpenJPEG = "OFF"
+ }
+ else {
+ $withOpenJPEG = "ON"
+ }
 
  cmake -G "Visual Studio 17 2022" `
  -A $msbuildPlatform `
@@ -48,7 +55,7 @@ function BuildForUWP($platform, $vcpkgPath, $runMsbuild) {
  -D BUILD_OPENJPEG=ON `
  -D ENABLE_LIBJPEG_TURBO_SIMD=OFF `
  -D WITH_JPEG=OFF `
- -D WITH_OPENJPEG=ON `
+ -D WITH_OPENJPEG=$withOpenJPEG `
  -D old-jpeg=ON `
  -D Tesseract_INCLUDE_DIR="${vcpkgPath}/installed/${platform}-windows-static/include/tesseract" `
  -D Tesseract_LIBRARY="${vcpkgPath}/installed/${platform}-windows-static/lib/tesseract41.lib" `