Small fixes

decompals · Jul 18, 2023 · 1900c03 · 1900c03
1 parent 61eabf8
commit 1900c03
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,3 +10,4 @@ png = "0.17.9"
 clap = { version = "4.1.12", features = ["derive"] }
 anyhow = "1.0.72"
 byteorder = "1.4.3"
+num_enum = "0.6.1"
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,17 +7,17 @@ pub use image::png_image::PNGImage;
 
 mod utils;
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TryFromPrimitive)]
 pub enum ImageSize {
-    Bits4,
+    Bits4 = 0,
     Bits8 = 1,
     Bits16 = 2,
     Bits32 = 3,
     DD = 5,
 }
 
 impl ImageSize {
-    fn get_tlut_size(&self) -> usize {
+    pub fn get_tlut_size(&self) -> usize {
         match self {
             ImageSize::Bits4 => 0x10,
             ImageSize::Bits8 => 0x100,
@@ -28,7 +28,7 @@ impl ImageSize {
     }
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TryFromPrimitive)]
 pub enum ImageFormat {
     Rgba = 0,
     Yuv = 1,
@@ -37,7 +37,7 @@ pub enum ImageFormat {
     I = 4,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TryFromPrimitive)]
 pub enum ImageType {
     I4,
     I8,
@@ -80,7 +80,7 @@ impl ImageType {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TryFromPrimitive)]
 #[repr(u8)]
 pub enum TextureLUT {
     None = 0,