Improve tile compressed pixel access API

benches/decompress.rs

@@ -1,5 +1,5 @@
 use criterion::{criterion_group, criterion_main, Criterion};
-use fitsrs::Pixels;
+use fitsrs::hdu::data::bintable::{self, data::BinaryTableData};
 
 fn criterion_benchmark_decompression(c: &mut Criterion) {
     let mut group = c.benchmark_group("decompression");
@@ -34,9 +34,22 @@ fn decompress(filename: &str) {
         if let HDU::XBinaryTable(hdu) = hdu {
             let width = hdu.get_header().get_parsed::<usize>("ZNAXIS1").unwrap();
             let height = hdu.get_header().get_parsed::<usize>("ZNAXIS2").unwrap();
-            let pixels = hdu_list.get_data(&hdu).collect::<Vec<_>>();
 
-            assert!(width * height == pixels.len());
+            match hdu_list.get_data(&hdu) {
+                BinaryTableData::TileCompressed(bintable::tile_compressed::pixels::Pixels::U8(
+                    pixels,
+                )) => assert!(width * height == pixels.count()),
+                BinaryTableData::TileCompressed(
+                    bintable::tile_compressed::pixels::Pixels::I16(pixels),
+                ) => assert!(width * height == pixels.count()),
+                BinaryTableData::TileCompressed(
+                    bintable::tile_compressed::pixels::Pixels::I32(pixels),
+                ) => assert!(width * height == pixels.count()),
+                BinaryTableData::TileCompressed(
+                    bintable::tile_compressed::pixels::Pixels::F32(pixels),
+                ) => assert!(width * height == pixels.count()),
+                _ => unreachable!(),
+            }
         }
     }
 }
@@ -57,7 +70,7 @@ fn read_image() {
                 let width = hdu.get_header().get_parsed::<usize>("NAXIS1").unwrap();
                 let height = hdu.get_header().get_parsed::<usize>("NAXIS2").unwrap();
                 let pixels = match hdu_list.get_data(&hdu).pixels() {
-                    Pixels::I16(it) => it.count(),
+                    fitsrs::hdu::data::image::Pixels::I16(it) => it.count(),
                     _ => unreachable!(),
                 };
 

src/hdu/data/bintable/data.rs

@@ -27,13 +27,13 @@ where
     }
 }
 
-use super::tile_compressed::TileCompressedData;
 #[derive(Debug)]
 pub enum BinaryTableData<R> {
     Table(TableData<R>),
-    TileCompressed(TileCompressedData<R>),
+    TileCompressed(Pixels<R>),
 }
 
+/*
 impl<R> Iterator for BinaryTableData<R>
 where
     R: Debug + Seek + Read,
@@ -47,26 +47,32 @@ where
         }
     }
 }
+*/
 
+use super::tile_compressed::pixels::Pixels;
 impl<R> BinaryTableData<R>
 where
     R: Debug + Read,
 {
     fn new(reader: R, header: &Header<BinTable>, start_pos: u64) -> Self {
         let ctx = header.get_xtension();
-
         let data = TableData::new(reader, header, start_pos);
 
         if let Some(tile_compressed) = &ctx.z_image {
-            BinaryTableData::TileCompressed(TileCompressedData::new(header, data, tile_compressed))
+            BinaryTableData::TileCompressed(Pixels::new(data, header, tile_compressed))
         } else {
             BinaryTableData::Table(data)
         }
     }
 
     pub fn table_data(self) -> TableData<R> {
         match self {
-            BinaryTableData::TileCompressed(tile) => tile.table_data(),
+            BinaryTableData::TileCompressed(pixels) => match pixels {
+                Pixels::U8(pixels) => pixels.row_it.table_data(),
+                Pixels::I16(pixels) => pixels.row_it.table_data(),
+                Pixels::I32(pixels) => pixels.row_it.table_data(),
+                Pixels::F32(pixels) => pixels.row_it.table_data(),
+            },
             BinaryTableData::Table(table) => table,
         }
     }
@@ -75,8 +81,13 @@ where
 impl<R> BinaryTableData<R> {
     pub fn row_iter(self) -> TableRowData<R> {
         match self {
-            Self::Table(table) => TableRowData::new(table),
-            Self::TileCompressed(TileCompressedData { row_it, .. }) => row_it,
+            BinaryTableData::TileCompressed(pixels) => match pixels {
+                Pixels::U8(pixels) => pixels.row_it,
+                Pixels::I16(pixels) => pixels.row_it,
+                Pixels::I32(pixels) => pixels.row_it,
+                Pixels::F32(pixels) => pixels.row_it,
+            },
+            BinaryTableData::Table(table) => table.row_iter(),
         }
     }
 }

src/hdu/data/bintable/mod.rs

@@ -1,12 +1,9 @@
 #![allow(clippy::upper_case_acronyms)]
 
 pub mod data;
-pub mod dithering;
-pub mod rice;
 pub mod row;
 pub mod tile_compressed;
 
-pub use data::BinaryTableData;
 pub use data::TableData;
 pub use row::TableRowData;