Skip to content

Commit

Permalink
Merge pull request #181 from imazen/turbo
Browse files Browse the repository at this point in the history
Rusty version of libjpeg-turbo codec
  • Loading branch information
kornelski authored Jun 1, 2018
2 parents cf2cc30 + 969a4f8 commit 6f7f054
Show file tree
Hide file tree
Showing 33 changed files with 10,528 additions and 9,005 deletions.
243 changes: 123 additions & 120 deletions Cargo.lock

Large diffs are not rendered by default.

226 changes: 128 additions & 98 deletions README.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ install:
- echo. && echo. && echo Installing NASM
- curl -L -o nasminst.exe http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-installer-x64.exe
- start /wait nasminst.exe /S
- curl -L -o "c_components/tests/catch.hpp" "https://github.com/catchorg/Catch2/releases/download/v1.11.0/catch.hpp"

test_script:
- if NOT "%CI_TAG%"=="" echo Purging build files for %CI_TAG%
Expand Down
4 changes: 2 additions & 2 deletions bindings/ruby/spec/context_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def c
c.execute framewise: {steps: [
{decode: {io_id: 0}},
{resample_2d: {w: 300, h: 200}},
{encode: {io_id: 1, preset: {"libjpegturbo": {quality: 90}}}}
{encode: {io_id: 1, preset: {"libjpeg": {quality: 90}}}}
]}

out_bytes = c.get_buffer(io_id: 1)
Expand Down Expand Up @@ -103,7 +103,7 @@ def c
c.execute framewise: {steps: [
{decode: {io_id: 0}},
{resample_2d: {w: 300, h: 200}},
{encode: {io_id: 1, preset: {"libjpegturbo": {}}}}
{encode: {io_id: 1, preset: {"libjpeg": {}}}}
]}

out_bytes = c.get_buffer(io_id: 1)
Expand Down
7 changes: 7 additions & 0 deletions c_components/tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "c_components_tests"
version = "0.1.0"
links = "imageflow_private_c_components_tests"
authors = ["Nathanael Jones <[email protected]>", "Kornel Lesiński <[email protected]>"]
workspace = "../../"
build = "src/build.rs"
Expand All @@ -13,7 +14,13 @@ path = "src/profile.rs"
imageflow_c_components = {path = ".."}
lcms2-sys = "2.4.8"
libpng-sys = "0.2.4"
mozjpeg-sys = "0.5.11"
libz-sys = "1.0.18"


[build-dependencies.cc]
version = "1.0.3"
features = ["parallel"]

[build-dependencies]
glob = "0.2.11"
Loading

0 comments on commit 6f7f054

Please sign in to comment.