Reorganize code into jxl-cli, jxl crates.

Also move some files from {x}.rs to {x}/mod.rs.
libjxl · Sep 16, 2024 · cdd4317 · cdd4317
1 parent f1c0dfa
commit cdd4317
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,24 +1,6 @@
-[package]
-name = "jxl"
-version = "0.1.0"
-authors = ["Luca Versari <[email protected]>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-thiserror = "1.0"
-byteorder = "1.4.3"
-num-derive = "0.3"
-num-traits = "0.2.14"
-array-init = "2.0.0"
-half = "1.7.1"
-jxl_headers_derive = { version = "=0.1.0", path = "jxl_headers_derive" }
-
 [profile.release]
 debug = true
 
 [workspace]
-members = ["jxl_headers_derive"]
-
-[features]
+members = [ "jxl", "jxl_cli", "jxl_headers_derive"]
+resolver = "2"
diff --git a/jxl/Cargo.toml b/jxl/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "jxl"
+version = "0.1.0"
+authors = ["Luca Versari <[email protected]>"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+thiserror = "1.0"
+byteorder = "1.4.3"
+num-derive = "0.3"
+num-traits = "0.2.14"
+array-init = "2.0.0"
+half = "1.7.1"
+jxl_headers_derive = { path = "../jxl_headers_derive" }
diff --git a/src/bit_reader.rs → jxl/src/bit_reader.rs b/src/bit_reader.rs → jxl/src/bit_reader.rs
diff --git a/src/bmff.rs → jxl/src/bmff.rs b/src/bmff.rs → jxl/src/bmff.rs
diff --git a/src/entropy_coding/ans.rs → jxl/src/entropy_coding/ans.rs b/src/entropy_coding/ans.rs → jxl/src/entropy_coding/ans.rs
diff --git a/src/entropy_coding/context_map.rs → jxl/src/entropy_coding/context_map.rs b/src/entropy_coding/context_map.rs → jxl/src/entropy_coding/context_map.rs
diff --git a/src/entropy_coding/decode.rs → jxl/src/entropy_coding/decode.rs b/src/entropy_coding/decode.rs → jxl/src/entropy_coding/decode.rs
diff --git a/src/entropy_coding/huffman.rs → jxl/src/entropy_coding/huffman.rs b/src/entropy_coding/huffman.rs → jxl/src/entropy_coding/huffman.rs
diff --git a/src/entropy_coding/hybrid_uint.rs → jxl/src/entropy_coding/hybrid_uint.rs b/src/entropy_coding/hybrid_uint.rs → jxl/src/entropy_coding/hybrid_uint.rs
diff --git a/src/entropy_coding.rs → jxl/src/entropy_coding/mod.rs b/src/entropy_coding.rs → jxl/src/entropy_coding/mod.rs
diff --git a/src/error.rs → jxl/src/error.rs b/src/error.rs → jxl/src/error.rs
diff --git a/src/headers/bit_depth.rs → jxl/src/headers/bit_depth.rs b/src/headers/bit_depth.rs → jxl/src/headers/bit_depth.rs
diff --git a/src/headers/color_encoding.rs → jxl/src/headers/color_encoding.rs b/src/headers/color_encoding.rs → jxl/src/headers/color_encoding.rs
diff --git a/src/headers/encodings.rs → jxl/src/headers/encodings.rs b/src/headers/encodings.rs → jxl/src/headers/encodings.rs
diff --git a/src/headers/extra_channels.rs → jxl/src/headers/extra_channels.rs b/src/headers/extra_channels.rs → jxl/src/headers/extra_channels.rs
diff --git a/src/headers/frame_header.rs → jxl/src/headers/frame_header.rs b/src/headers/frame_header.rs → jxl/src/headers/frame_header.rs
diff --git a/src/headers/image_metadata.rs → jxl/src/headers/image_metadata.rs b/src/headers/image_metadata.rs → jxl/src/headers/image_metadata.rs
diff --git a/src/headers.rs → jxl/src/headers/mod.rs b/src/headers.rs → jxl/src/headers/mod.rs
diff --git a/src/headers/size.rs → jxl/src/headers/size.rs b/src/headers/size.rs → jxl/src/headers/size.rs
diff --git a/src/headers/transform_data.rs → jxl/src/headers/transform_data.rs b/src/headers/transform_data.rs → jxl/src/headers/transform_data.rs
diff --git a/src/icc.rs → jxl/src/icc.rs b/src/icc.rs → jxl/src/icc.rs
diff --git a/src/lib.rs → jxl/src/lib.rs b/src/lib.rs → jxl/src/lib.rs
diff --git a/src/util.rs → jxl/src/util.rs b/src/util.rs → jxl/src/util.rs
diff --git a/jxl_cli/Cargo.toml b/jxl_cli/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "jxl_cli"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+jxl = { path = "../jxl" }
diff --git a/src/main.rs → jxl_cli/src/main.rs b/src/main.rs → jxl_cli/src/main.rs