Skip to content

Commit

Permalink
Merge pull request #77 from kozakura913/image_crates_io
Browse files Browse the repository at this point in the history
image-rsをcrates.io版に戻す
  • Loading branch information
kozakura913 authored Dec 28, 2024
2 parents 610e15e + 61d48c5 commit 8d5a8f8
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "image-rs"]
path = image-rs
url = https://github.com/kozakura913/image.git
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ headers = "^0.3.8"
serde = {version="^1.0.164",features=["derive"]}
serde_json ="1"
reqwest = { version = "0.11", default-features = false , features = ["stream","rustls-tls-webpki-roots"] }
#image = "0.25"
image = { path = "./image-rs" }
image = "^0.25.5"
webp = { version = "0.3.0", default-features = false }
resvg = {version="0.41",features = [ "text","memmap-fonts","raster-images" ] }
rexif = "0.7"
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN --mount=type=cache,target=/musl sh /app/crossfiles/deps.sh
WORKDIR /app
COPY avif-decoder_dep ./avif-decoder_dep
COPY .gitmodules ./.gitmodules
COPY image-rs ./image-rs
COPY --from=0 /dav1d /dav1d
COPY src ./src
COPY Cargo.toml ./Cargo.toml
Expand Down
4 changes: 2 additions & 2 deletions avif-decoder_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
image = { path = "../image-rs" , features = ["avif-native"] }
image = { version = "*" , features = ["avif-native"] }

[target.'cfg(any(target_arch = "x86",target_arch = "x86_64"))'.dependencies.image]
path = "../image-rs"
version = "*"
default-features = false
features = ["nasm"]
1 change: 0 additions & 1 deletion image-rs
Submodule image-rs deleted from ac91a0

0 comments on commit 8d5a8f8

Please sign in to comment.