diff options
Diffstat (limited to 'src/block')
| -rw-r--r-- | src/block/block.rs | 8 | ||||
| -rw-r--r-- | src/block/indexedimage.rs (renamed from src/block/image.rs) | 6 | ||||
| -rw-r--r-- | src/block/mod.rs | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/block/block.rs b/src/block/block.rs index 95ff12e..329361f 100644 --- a/src/block/block.rs +++ b/src/block/block.rs @@ -1,9 +1,5 @@ -use crate::block::Version; - -use super::ScreenDescriptor; - +use super::IndexedImage; pub enum Block { - Version(Version), - LogicalScreenDescriptor(ScreenDescriptor) + IndexedImage(IndexedImage) } \ No newline at end of file diff --git a/src/block/image.rs b/src/block/indexedimage.rs index 07f9555..ae2da06 100644 --- a/src/block/image.rs +++ b/src/block/indexedimage.rs @@ -1,21 +1,19 @@ use crate::LZW; use super::{ColorTable, ImageDescriptor}; -pub struct Image { +pub struct IndexedImage { pub image_descriptor: ImageDescriptor, pub local_color_table: Option<ColorTable>, pub indicies: Vec<u8> } -impl Image { +impl IndexedImage { pub fn as_boxed_slice(&self, minimum_code_size: u8) -> Box<[u8]> { let mut out = vec![]; let mut boxed: Box<[u8]> = (&self.image_descriptor).into(); out.extend_from_slice(&*boxed); - // Table based image data // - // Get the mcs while we write out the color table let mut mcs = if let Some(lct) = &self.local_color_table { boxed = lct.into(); diff --git a/src/block/mod.rs b/src/block/mod.rs index 049b39a..a0c2454 100644 --- a/src/block/mod.rs +++ b/src/block/mod.rs @@ -1,13 +1,13 @@ mod block; mod colortable; -mod image; +mod indexedimage; mod imagedescriptor; mod screendescriptor; mod version; pub use block::Block; pub use colortable::ColorTable; -pub use image::Image; +pub use indexedimage::IndexedImage; pub use imagedescriptor::ImageDescriptor; pub use screendescriptor::ScreenDescriptor; pub use version::Version; \ No newline at end of file |