Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert opencv version #25

Merged
merged 7 commits into from
Nov 29, 2023
Merged

Revert opencv version #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca72a92
Revert opencv version
ac-freeman Nov 13, 2023
cf35d17
Update rust.yml
ac-freeman Nov 29, 2023
d5627d9
Update rust.yml
ac-freeman Nov 29, 2023
edcc28e
Update rust.yml
ac-freeman Nov 29, 2023
c275a8d
Update rust.yml
ac-freeman Nov 29, 2023
fa75b30
Update rust.yml
ac-freeman Nov 29, 2023
291f47f
Bump crate version
ac-freeman Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
check_ubuntu:
name: Build on Ubuntu
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Add public keys
Expand All @@ -26,16 +26,16 @@ jobs:
override: true

- name: Install OpenCV
run: sudo apt-get install -y --fix-missing libopencv-dev libopencv-calib3d-dev libopencv-contrib-dev libopencv-features2d-dev libopencv-highgui-dev libopencv-imgcodecs-dev libopencv-objdetect-dev libopencv-shape-dev libopencv-stitching-dev libopencv-superres-dev libopencv-video-dev libopencv-videoio-dev libopencv-videostab-dev libopencv4.2-java libopencv-calib3d4.2 libopencv-contrib4.2 libopencv-features2d4.2 libopencv-highgui4.2 libopencv-imgcodecs4.2 libopencv-videoio4.2 libgdal26 libodbc1
run: sudo apt-get install -y --fix-missing libopencv-dev libopencv-calib3d-dev libopencv-contrib-dev libopencv-features2d-dev libopencv-highgui-dev libopencv-imgcodecs-dev libopencv-objdetect-dev libopencv-shape-dev libopencv-stitching-dev libopencv-superres-dev libopencv-video-dev libopencv-videoio-dev libopencv-videostab-dev libopencv4.5-java libopencv-calib3d4.5 libopencv-contrib4.5 libopencv-features2d4.5 libopencv-highgui4.5 libopencv-imgcodecs4.5 libopencv-videoio4.5

- name: Clang
run: sudo apt-get install -y clang && sudo ln -s libclang.so.1 /usr/lib/llvm-10/lib/libclang.so
run: sudo apt-get install -y clang && sudo apt-get install -y clang-format clang-tidy clang-tools clang clangd libc++-dev libc++1 libc++abi-dev libc++abi1 libclang-dev libclang1 liblldb-dev libllvm-ocaml-dev libomp-dev libomp5 lld lldb llvm-dev llvm-runtime llvm python3-clang

- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev

- name: Install other deps
run: sudo apt-get install -y portaudio19-dev build-essential libpulse-dev libdbus-1-dev pkg-config libx11-dev libatk1.0-dev libgtk-3-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libwayland-dev libxkbcommon-dev
run: sudo apt-get install -y portaudio19-dev build-essential libpulse-dev libdbus-1-dev pkg-config libx11-dev libatk1.0-dev libgtk-3-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libwayland-dev libxkbcommon-dev libstdc++-12-dev

- name: Check project
run: cargo check
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "davis-edi-rs"
version = "0.2.3"
version = "0.2.4"
edition = "2021"
authors = ["Andrew C. Freeman"]
description = "A fast, Rust-based, open-source implementation of the paper \"Bringing a Blurry Frame Alive at High Frame-Rate with an Event Camera\" (2019) by Pan et al."
Expand All @@ -13,7 +13,7 @@ categories = ["multimedia::encoding", "science"]
exclude = ["dataset", "**/*.gif"]

[dependencies]
opencv = "0.84.5"
opencv = "0.83.0"
clap = { version = "4.0.17", features = ["derive"] }
rayon = "1.5"
toml = "0.5.8"
Expand All @@ -36,7 +36,7 @@ async-trait = "0.1.57"
version = '0.24.1'
default-features = false
features = [
'opencv_0-84',
'opencv_0-83',
'nalgebra_0-32'
]

Expand Down
Loading