extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 12:35:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

upgrade dependencies (#4116)

Browse Source 
* remove unused dependencies

* upgrade dependency bytes 0.5.6 -> 1.1.0

* upgrade dependency heapless 0.6.1 -> 0.7.8

* upgrade dependency image 0.22.4 -> 0.23.14

* upgrade dependency mp4 0.8.2 -> 0.9.0

* upgrade dependency bson 0.14.1 -> 2.0.1

Bson::Undefined, Bson::MaxKey, Bson::MinKey and Bson::DbPointer
weren't present in the previous version.

Co-authored-by: ahkrr <alexhk@protonmail.com>
This commit is contained in:
ahkrr
2021-11-14 07:32:21 +01:00
committed by GitHub
parent 649b3804c1
commit 74b812228c
14 changed files with 91 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu_plugin_binaryview/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies]
crossterm = "0.19"
image = { version="0.22.4", default_features=false, features=["png_codec", "jpeg"] }
image = { version = "0.23.14", default_features = false, features = ["png", "jpeg"] }
neso = "0.5.0"
nu-errors = { path="../nu-errors", version = "0.39.0" }
nu-plugin = { path="../nu-plugin", version = "0.39.0" }

26
crates/nu_plugin_binaryview/src/binaryview.rs
View File

@ -167,7 +167,7 @@ impl RenderContext {
#[derive(Debug)]
struct RawImageBuffer {
dimensions: (u64, u64),
dimensions: (u32, u32),
colortype: image::ColorType,
buffer: Vec<u8>,
}
@ -175,11 +175,12 @@ struct RawImageBuffer {
fn load_from_png_buffer(buffer: &[u8]) -> Result<RawImageBuffer, Box<dyn std::error::Error>> {
use image::ImageDecoder;
let decoder = image::png::PNGDecoder::new(buffer)?;
let decoder = image::codecs::png::PngDecoder::new(buffer)?;
let dimensions = decoder.dimensions();
let colortype = decoder.colortype();
let buffer = decoder.read_image()?;
let colortype = decoder.color_type();
let mut buffer: Vec<u8> = vec![0; decoder.total_bytes() as usize];
decoder.read_image(&mut buffer)?;
Ok(RawImageBuffer {
dimensions,
@ -191,11 +192,12 @@ fn load_from_png_buffer(buffer: &[u8]) -> Result<RawImageBuffer, Box<dyn std::er
fn load_from_jpg_buffer(buffer: &[u8]) -> Result<RawImageBuffer, Box<dyn std::error::Error>> {
use image::ImageDecoder;
let decoder = image::jpeg::JPEGDecoder::new(buffer)?;
let decoder = image::codecs::jpeg::JpegDecoder::new(buffer)?;
let dimensions = decoder.dimensions();
let colortype = decoder.colortype();
let buffer = decoder.read_image()?;
let colortype = decoder.color_type();
let mut buffer: Vec<u8> = vec![0; decoder.total_bytes() as usize];
decoder.read_image(&mut buffer)?;
Ok(RawImageBuffer {
dimensions,
@ -245,7 +247,7 @@ pub fn view_contents(
render_context.clear();
match raw_image_buffer.colortype {
image::ColorType::RGBA(8) => {
image::ColorType::Rgba8 => {
let img = image::ImageBuffer::<image::Rgba<u8>, Vec<u8>>::from_vec(
raw_image_buffer.dimensions.0 as u32,
raw_image_buffer.dimensions.1 as u32,
@ -257,7 +259,7 @@ pub fn view_contents(
&img,
render_context.width as u32,
render_context.height as u32,
image::FilterType::Lanczos3,
image::imageops::FilterType::Lanczos3,
);
for (count, pixel) in resized_img.pixels().enumerate() {
@ -266,7 +268,7 @@ pub fn view_contents(
render_context.frame_buffer[count] = (rgb[0], rgb[1], rgb[2]);
}
}
image::ColorType::RGB(8) => {
image::ColorType::Rgb8 => {
let img = image::ImageBuffer::<image::Rgb<u8>, Vec<u8>>::from_vec(
raw_image_buffer.dimensions.0 as u32,
raw_image_buffer.dimensions.1 as u32,
@ -278,7 +280,7 @@ pub fn view_contents(
&img,
render_context.width as u32,
render_context.height as u32,
image::FilterType::Lanczos3,
image::imageops::FilterType::Lanczos3,
);
for (count, pixel) in resized_img.pixels().enumerate() {
@ -359,7 +361,7 @@ pub fn view_contents_interactive(
&img,
render_context.width as u32,
render_context.height as u32,
image::FilterType::Lanczos3,
image::imageops::FilterType::Lanczos3,
);
render_context.clear();