Skip to content

Commit 6ef4a41

Browse files
spacey-sootymcm001
andauthored
Bump OpenCv to 4.10 (#14)
* Bump OpenCv to 4.10 Signed-off-by: Jade Turner <spacey-sooty@proton.me> * test rerun Signed-off-by: Jade Turner <spacey-sooty@proton.me> * Update main.yml --------- Signed-off-by: Jade Turner <spacey-sooty@proton.me> Co-authored-by: Matt <matthew.morley.ca@gmail.com>
1 parent 0db16ac commit 6ef4a41

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- uses: pguyot/arm-runner-action@v2
4848
with:
49-
base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v1.30/ubuntu-22.04.3-preinstalled-server-arm64-orangepi-5.img.xz
49+
base_image: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-7/photonvision_opi5.img.xz
5050
cpu: cortex-a7
5151
image_additional_mb: 1500
5252
bind_mount_repository: true

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ set(RGA_PATH ${CMAKE_SOURCE_DIR}/src/main/native/lib/3rdparty/rga/RK3588)
3434
set(RGA_LIB ${RGA_PATH}/lib/Linux/${LIB_ARCH}/librga.so)
3535

3636

37-
set(OPENCV_YEAR "frc2024")
38-
set(OPENCV_VERSION "4.8.0-2")
37+
set(OPENCV_YEAR "frc2025")
38+
set(OPENCV_VERSION "4.10.0-3")
3939
# also valid: windowsx86-64
4040

4141
# type can be "", "debug", "static", or "staticdebug"
@@ -109,7 +109,7 @@ message("RGA is ${RGA_LIB}")
109109

110110
add_executable(main_test src/main/native/cpp/main_test.cc)
111111
target_link_libraries(main_test ${PROJECT_NAME} ${RGA_LIB})
112-
target_include_directories(main_test PRIVATE
112+
target_include_directories(main_test PRIVATE
113113
${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include
114114
${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include/model_zoo
115115
${OPENCV_INCLUDE_PATH}

0 commit comments

Comments
 (0)