From bb245eb57779674be4b59ffbb2e21d0a3e897d40 Mon Sep 17 00:00:00 2001 From: Matthieu BAUMANN Date: Fri, 24 Mar 2023 11:05:37 +0100 Subject: [PATCH] first commit --- src/core/Cargo.toml | 3 ++- src/core/src/renderable/image/mod.rs | 6 +++--- src/core/src/renderable/image/subdivide_texture.rs | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index db1b0d74..9604d9d6 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -3,7 +3,7 @@ name = "aladin-lite" description = "Aladin Lite v3 introduces a new graphical engine written in Rust with the use of WebGL" license = "BSD-3-Clause" repository = "https://github.com/cds-astro/aladin-lite" -version = "3.0.0" +version = "3.1.1" authors = ["baumannmatthieu0@gmail.com", "matthieu.baumann@astro.unistra.fr"] edition = "2018" @@ -42,6 +42,7 @@ mapproj = "0.3.0" wcs = "0.2.4" colorgrad = "0.6.2" image-decoder = { package = "image", version = "0.24.2", default-features = false, features = ["jpeg", "png"] } +votable = "0.1.1-alpha" [features] webgl1 = [ diff --git a/src/core/src/renderable/image/mod.rs b/src/core/src/renderable/image/mod.rs index 8c08e102..73e683b8 100644 --- a/src/core/src/renderable/image/mod.rs +++ b/src/core/src/renderable/image/mod.rs @@ -186,7 +186,7 @@ impl Image { .filter_map(|v| if v == (blank as i32) { None } else { - Some(v as f32) + Some(v) }) .collect::>(); @@ -208,7 +208,7 @@ impl Image { .filter_map(|v| if v == (blank as i32) { None } else { - Some(v as f32) + Some(v as i32) }) .collect::>(); @@ -248,7 +248,7 @@ impl Image { let mut samples = samples .into_iter() - .filter_map(|v| if v == blank || v.is_nan() { + .filter_map(|v| if v == blank || v.is_nan() || v.is_zero() { None } else { Some(v) diff --git a/src/core/src/renderable/image/subdivide_texture.rs b/src/core/src/renderable/image/subdivide_texture.rs index 00517b1f..d2dfee27 100644 --- a/src/core/src/renderable/image/subdivide_texture.rs +++ b/src/core/src/renderable/image/subdivide_texture.rs @@ -53,6 +53,7 @@ where } else { max_tex_size }; + let num_bytes_to_read = (num_pixels_to_read as usize) * std::mem::size_of::<::Item>(); reader.read_exact(&mut buf[..num_bytes_to_read]) .await