Refactor out lossless JPEG code so that it can eventually be used independently

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lepton_jpeg"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 authors = ["Kristof Roomp <[email protected]>"]
 

package/Lepton.Jpeg.Rust.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Lepton.Jpeg.Rust</id>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <title>Lepton JPEG Compression Rust version binaries and libraries</title>
     <authors>kristofr</authors>
     <owners>kristofr</owners>

src/structs/bit_writer.rs → src/jpeg/bit_writer.rs

@@ -142,11 +142,11 @@ impl BitWriter {
 #[cfg(test)]
 use std::io::Cursor;
 
+#[cfg(test)]
+use super::bit_reader::BitReader;
 use crate::helpers::has_ff;
 #[cfg(test)]
 use crate::helpers::u32_bit_length;
-#[cfg(test)]
-use crate::structs::bit_reader::BitReader;
 
 // write a test pattern with an escape and see if it matches
 #[test]

src/structs/block_based_image.rs → src/jpeg/block_based_image.rs

@@ -9,8 +9,8 @@ use log::info;
 use wide::{i16x8, CmpEq};
 
 use crate::consts::ZIGZAG_TO_TRANSPOSED;
-use crate::structs::block_context::BlockContext;
-use crate::structs::jpeg_header::JPegHeader;
+
+use super::jpeg_header::JPegHeader;
 
 /// holds the 8x8 blocks for a given component. Since we do multithreaded encoding,
 /// the image may only hold a subset of the components (specified by dpos_offset),
@@ -110,16 +110,6 @@ impl BlockBasedImage {
         );
     }
 
-    // blocks above the first line are never dereferenced
-    pub fn off_y(&self, y: u32) -> BlockContext {
-        return BlockContext::new(
-            self.block_width * y,
-            if y > 0 { self.block_width * (y - 1) } else { 0 },
-            if (y & 1) != 0 { self.block_width } else { 0 },
-            if (y & 1) != 0 { 0 } else { self.block_width },
-        );
-    }
-
     pub fn get_block_width(&self) -> u32 {
         self.block_width
     }