From 3282031ec7878773247f8d1ae5fab92324eebe7c Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Sun, 7 Apr 2024 12:19:46 -0700 Subject: [PATCH] Switch to byteorder-lite crate --- Cargo.toml | 2 +- src/codecs/bmp/decoder.rs | 2 +- src/codecs/bmp/encoder.rs | 2 +- src/codecs/dds.rs | 2 +- src/codecs/farbfeld.rs | 2 +- src/codecs/ico/decoder.rs | 2 +- src/codecs/ico/encoder.rs | 2 +- src/codecs/png.rs | 4 ++-- src/codecs/pnm/decoder.rs | 2 +- src/codecs/pnm/encoder.rs | 2 +- src/codecs/pnm/mod.rs | 2 +- src/codecs/tga/decoder.rs | 2 +- src/codecs/tga/header.rs | 2 +- tests/reference_images.rs | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 779fc6bdbc..5fb62ae321 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ exclude = ["src/png/testdata/*", "examples/*", "tests/*"] [dependencies] bytemuck = { version = "1.8.0", features = ["extern_crate_alloc"] } # includes cast_vec -byteorder = "1.3.2" +byteorder-lite = "0.1.0" num-traits = { version = "0.2.0" } # Optional dependencies diff --git a/src/codecs/bmp/decoder.rs b/src/codecs/bmp/decoder.rs index a6d8970d54..b66d998109 100644 --- a/src/codecs/bmp/decoder.rs +++ b/src/codecs/bmp/decoder.rs @@ -4,7 +4,7 @@ use std::iter::{repeat, Rev}; use std::slice::ChunksMut; use std::{error, fmt}; -use byteorder::{LittleEndian, ReadBytesExt}; +use byteorder_lite::{LittleEndian, ReadBytesExt}; use crate::color::ColorType; use crate::error::{ diff --git a/src/codecs/bmp/encoder.rs b/src/codecs/bmp/encoder.rs index 512d25ace5..f9e40e3172 100644 --- a/src/codecs/bmp/encoder.rs +++ b/src/codecs/bmp/encoder.rs @@ -1,4 +1,4 @@ -use byteorder::{LittleEndian, WriteBytesExt}; +use byteorder_lite::{LittleEndian, WriteBytesExt}; use std::io::{self, Write}; use crate::error::{ diff --git a/src/codecs/dds.rs b/src/codecs/dds.rs index 88c94c2486..2f07eee77d 100644 --- a/src/codecs/dds.rs +++ b/src/codecs/dds.rs @@ -8,7 +8,7 @@ use std::io::Read; use std::{error, fmt}; -use byteorder::{LittleEndian, ReadBytesExt}; +use byteorder_lite::{LittleEndian, ReadBytesExt}; #[allow(deprecated)] use crate::codecs::dxt::{DxtDecoder, DxtVariant}; diff --git a/src/codecs/farbfeld.rs b/src/codecs/farbfeld.rs index 90e2005ae4..96b9ba858e 100644 --- a/src/codecs/farbfeld.rs +++ b/src/codecs/farbfeld.rs @@ -315,7 +315,7 @@ impl ImageEncoder for FarbfeldEncoder { mod tests { use crate::codecs::farbfeld::FarbfeldDecoder; use crate::ImageDecoderRect; - use byteorder::{ByteOrder, NativeEndian}; + use byteorder_lite::{ByteOrder, NativeEndian}; use std::io::{Cursor, Seek, SeekFrom}; static RECTANGLE_IN: &[u8] = b"farbfeld\ diff --git a/src/codecs/ico/decoder.rs b/src/codecs/ico/decoder.rs index 0ad4cf613d..fb1f9a323e 100644 --- a/src/codecs/ico/decoder.rs +++ b/src/codecs/ico/decoder.rs @@ -1,4 +1,4 @@ -use byteorder::{LittleEndian, ReadBytesExt}; +use byteorder_lite::{LittleEndian, ReadBytesExt}; use std::io::{BufRead, Read, Seek, SeekFrom}; use std::{error, fmt}; diff --git a/src/codecs/ico/encoder.rs b/src/codecs/ico/encoder.rs index 88facebff8..23892f0469 100644 --- a/src/codecs/ico/encoder.rs +++ b/src/codecs/ico/encoder.rs @@ -1,4 +1,4 @@ -use byteorder::{LittleEndian, WriteBytesExt}; +use byteorder_lite::{LittleEndian, WriteBytesExt}; use std::borrow::Cow; use std::io::{self, Write}; diff --git a/src/codecs/png.rs b/src/codecs/png.rs index bdaa6b3aac..26ea15d9d3 100644 --- a/src/codecs/png.rs +++ b/src/codecs/png.rs @@ -178,7 +178,7 @@ impl ImageDecoder for PngDecoder { } fn read_image(mut self, buf: &mut [u8]) -> ImageResult<()> { - use byteorder::{BigEndian, ByteOrder, NativeEndian}; + use byteorder_lite::{BigEndian, ByteOrder, NativeEndian}; assert_eq!(u64::try_from(buf.len()), Ok(self.total_bytes())); self.reader.next_frame(buf).map_err(ImageError::from_png)?; @@ -607,7 +607,7 @@ impl ImageEncoder for PngEncoder { height: u32, color_type: ExtendedColorType, ) -> ImageResult<()> { - use byteorder::{BigEndian, ByteOrder, NativeEndian}; + use byteorder_lite::{BigEndian, ByteOrder, NativeEndian}; use ExtendedColorType::*; let expected_buffer_len = color_type.buffer_size(width, height); diff --git a/src/codecs/pnm/decoder.rs b/src/codecs/pnm/decoder.rs index 1c619c6fb1..05bd7cda35 100644 --- a/src/codecs/pnm/decoder.rs +++ b/src/codecs/pnm/decoder.rs @@ -13,7 +13,7 @@ use crate::error::{ use crate::image::{ImageDecoder, ImageFormat}; use crate::utils; -use byteorder::{BigEndian, ByteOrder, NativeEndian}; +use byteorder_lite::{BigEndian, ByteOrder, NativeEndian}; /// All errors that can occur when attempting to parse a PNM #[derive(Debug, Clone)] diff --git a/src/codecs/pnm/encoder.rs b/src/codecs/pnm/encoder.rs index bd86cdb52a..b1ca5d93f4 100644 --- a/src/codecs/pnm/encoder.rs +++ b/src/codecs/pnm/encoder.rs @@ -14,7 +14,7 @@ use crate::error::{ }; use crate::image::{ImageEncoder, ImageFormat}; -use byteorder::{BigEndian, WriteBytesExt}; +use byteorder_lite::{BigEndian, WriteBytesExt}; enum HeaderStrategy { Dynamic, diff --git a/src/codecs/pnm/mod.rs b/src/codecs/pnm/mod.rs index ac9d390fa9..1e7f324e93 100644 --- a/src/codecs/pnm/mod.rs +++ b/src/codecs/pnm/mod.rs @@ -22,7 +22,7 @@ mod tests { use super::*; use crate::image::ImageDecoder; use crate::ExtendedColorType; - use byteorder::{ByteOrder, NativeEndian}; + use byteorder_lite::{ByteOrder, NativeEndian}; fn execute_roundtrip_default(buffer: &[u8], width: u32, height: u32, color: ExtendedColorType) { let mut encoded_buffer = Vec::new(); diff --git a/src/codecs/tga/decoder.rs b/src/codecs/tga/decoder.rs index f3046edd7f..a0fcb534c9 100644 --- a/src/codecs/tga/decoder.rs +++ b/src/codecs/tga/decoder.rs @@ -6,7 +6,7 @@ use crate::{ }, image::{ImageDecoder, ImageFormat}, }; -use byteorder::ReadBytesExt; +use byteorder_lite::ReadBytesExt; use std::io::{self, Read}; struct ColorMap { diff --git a/src/codecs/tga/header.rs b/src/codecs/tga/header.rs index 4460610100..26588b6246 100644 --- a/src/codecs/tga/header.rs +++ b/src/codecs/tga/header.rs @@ -2,7 +2,7 @@ use crate::{ error::{UnsupportedError, UnsupportedErrorKind}, ExtendedColorType, ImageError, ImageFormat, ImageResult, }; -use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; +use byteorder_lite::{LittleEndian, ReadBytesExt, WriteBytesExt}; use std::io::{Read, Write}; pub(crate) const ALPHA_BIT_MASK: u8 = 0b1111; diff --git a/tests/reference_images.rs b/tests/reference_images.rs index 4d46f8c7b1..e695d1844a 100644 --- a/tests/reference_images.rs +++ b/tests/reference_images.rs @@ -314,7 +314,7 @@ fn check_references() { #[cfg(feature = "hdr")] #[test] fn check_hdr_references() { - use byteorder::{LittleEndian as LE, ReadBytesExt}; + use byteorder_lite::{LittleEndian as LE, ReadBytesExt}; use std::fs::File; use std::io::BufReader; use std::path::Path;