diff --git a/Cargo.lock b/Cargo.lock index a3a8e90..2a8ba7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler32" version = "1.0.3" @@ -21,6 +23,12 @@ dependencies = [ "nodrop", ] +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "0.7.0" @@ -57,6 +65,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cgl" version = "0.2.2" @@ -124,7 +138,7 @@ dependencies = [ "byteorder", "getopts", "gfx_device_gl", - "image", + "image 0.22.5", "piston", "piston2d-graphics", "piston2d-opengl_graphics", @@ -133,6 +147,15 @@ dependencies = [ "pistoncore-sdl2_window", ] +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "crossbeam-deque" version = "0.2.0" @@ -150,7 +173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" dependencies = [ "arrayvec", - "cfg-if", + "cfg-if 0.1.4", "crossbeam-utils", "lazy_static 1.0.1", "memoffset", @@ -164,7 +187,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" dependencies = [ - "cfg-if", + "cfg-if 0.1.4", ] [[package]] @@ -373,12 +396,29 @@ dependencies = [ "lzw", "num-derive", "num-iter", - "num-rational", - "num-traits 0.2.5", - "png", + "num-rational 0.1.42", + "num-traits 0.2.15", + "png 0.12.0", "scoped_threadpool", ] +[[package]] +name = "image" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" +dependencies = [ + "byteorder", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational 0.2.4", + "num-traits 0.2.15", + "png 0.15.3", + "scoped_threadpool", + "tiff", +] + [[package]] name = "inflate" version = "0.4.3" @@ -453,7 +493,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" dependencies = [ - "cfg-if", + "cfg-if 0.1.4", ] [[package]] @@ -501,7 +541,7 @@ checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" dependencies = [ "num-integer", "num-iter", - "num-traits 0.2.5", + "num-traits 0.2.15", ] [[package]] @@ -510,7 +550,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7" dependencies = [ - "num-traits 0.2.5", + "num-traits 0.2.15", "proc-macro2", "quote 0.6.3", "syn 0.14.3", @@ -518,11 +558,12 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.39" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "num-traits 0.2.5", + "autocfg", + "num-traits 0.2.15", ] [[package]] @@ -532,7 +573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" dependencies = [ "num-integer", - "num-traits 0.2.5", + "num-traits 0.2.15", ] [[package]] @@ -542,7 +583,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" dependencies = [ "num-integer", - "num-traits 0.2.5", + "num-traits 0.2.15", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-integer", + "num-traits 0.2.15", ] [[package]] @@ -551,14 +603,17 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.5", + "num-traits 0.2.15", ] [[package]] name = "num-traits" -version = "0.2.5" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] [[package]] name = "num_cpus" @@ -628,7 +683,7 @@ checksum = "83a5f6a965b7e3e98f0c6a6287d0ffc79dd54f65eeca15f8015217a4a23ad5a8" dependencies = [ "gfx", "gfx_core", - "image", + "image 0.19.0", "piston-texture", ] @@ -690,7 +745,7 @@ checksum = "e4a3a819765c46f1fb1cf0258a214bc9b5ecb1ced4277d82617b01178c73080a" dependencies = [ "fnv", "gl", - "image", + "image 0.19.0", "khronos_api", "piston-shaders_graphics2d", "piston-texture", @@ -790,6 +845,18 @@ dependencies = [ "num-iter", ] +[[package]] +name = "png" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" +dependencies = [ + "bitflags 1.0.3", + "crc32fast", + "deflate", + "inflate", +] + [[package]] name = "proc-macro2" version = "0.4.6" @@ -923,7 +990,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c543ce8a6e33a30cb909612eeeb22e693848211a84558d5a00bb11e791b7ab7" dependencies = [ - "cfg-if", + "cfg-if 0.1.4", ] [[package]] @@ -1002,6 +1069,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "tiff" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" +dependencies = [ + "byteorder", + "lzw", + "num-derive", + "num-traits 0.2.15", +] + [[package]] name = "token_store" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 2c51461..9e375fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ piston_window = "0.80.0" piston2d-graphics = "0.26.0" pistoncore-glutin_window = "0.47.0" piston2d-opengl_graphics = "0.53.0" -image = "0.19.0" +image = "0.22.5" getopts = "0.2" gfx_device_gl = "0.15.3" pistoncore-sdl2_window = "*"