Implement encoding for more types (#14)

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>

Author: LPGhatguy

src/enums.rs

@@ -1,18 +1,26 @@
-use core::{fmt, num::NonZeroU32};
+use core::{
+    fmt,
+    num::{NonZeroU32, NonZeroU8},
+};
 
 macro_rules! pseudo_enum {
-    ($(#[$attr:meta])* $name:ident { $($case:ident = $value:literal,)* }) => {
+    ($(#[$attr:meta])* $container:ident($prim:ident) $name:ident { $($case:ident = $value:literal,)* }) => {
         $(#[$attr])*
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-        pub struct $name(pub NonZeroU32);
+        pub struct $name($container);
+
         #[allow(non_upper_case_globals)]
         impl $name {
-            pub fn new(x: u32) -> Option<Self> {
-                Some(Self(NonZeroU32::new(x)?))
+            pub fn new(x: $prim) -> Option<Self> {
+                Some(Self($container::new(x)?))
+            }
+
+            pub fn value(&self) -> $prim {
+                self.0.get()
             }
 
             $(
-                pub const $case: Self = Self(unsafe { NonZeroU32::new_unchecked($value) });
+                pub const $case: Self = Self(unsafe { $container::new_unchecked($value) });
             )*
         }
 
@@ -33,7 +41,7 @@ macro_rules! pseudo_enum {
 
 pseudo_enum! {
     /// Known texture formats
-    Format {
+    NonZeroU32(u32) Format {
         R4G4_UNORM_PACK8 = 1,
         R4G4B4A4_UNORM_PACK16 = 2,
         B4G4R4A4_UNORM_PACK16 = 3,
@@ -206,15 +214,15 @@ pseudo_enum! {
 
 pseudo_enum! {
     /// Known supercompression schemes
-    SupercompressionScheme {
+    NonZeroU32(u32) SupercompressionScheme {
         BasisLZ = 1,
         Zstandard = 2,
         ZLIB = 3,
     }
 }
 
 pseudo_enum! {
-    ColorModel {
+    NonZeroU8(u8) ColorModel {
         RGBSDA = 1,
         YUVSDA = 2,
         YIQSDA = 3,
@@ -248,7 +256,7 @@ pseudo_enum! {
 }
 
 pseudo_enum! {
-    ColorPrimaries {
+    NonZeroU8(u8) ColorPrimaries {
         BT709 = 1,
         BT601EBU = 2,
         BT601SMPTE = 3,
@@ -264,7 +272,7 @@ pseudo_enum! {
 }
 
 pseudo_enum! {
-    TransferFunction {
+    NonZeroU8(u8) TransferFunction {
         Linear = 1,
         SRGB = 2,
         ITU = 3,

src/error.rs

@@ -2,7 +2,7 @@ use core::fmt;
 #[cfg(feature = "std")]
 use std::error::Error;
 
-/// Error, that happend when data doesn't satisfy expected parameters.
+/// Error, that happened when data doesn't satisfy expected parameters.
 #[derive(Debug)]
 #[non_exhaustive]
 pub enum ParseError {
@@ -12,6 +12,8 @@ pub enum ParseError {
     ZeroWidth,
     /// Zero face count
     ZeroFaceCount,
+    /// Data Format Descriptor had an invalid sample bit length.
+    InvalidSampleBitLength,
     /// Unexpected end of buffer
     UnexpectedEnd,
 }
@@ -25,6 +27,7 @@ impl fmt::Display for ParseError {
             ParseError::BadMagic => f.pad("unexpected magic numbers"),
             ParseError::ZeroWidth => f.pad("zero pixel width"),
             ParseError::ZeroFaceCount => f.pad("zero face count"),
+            ParseError::InvalidSampleBitLength => f.pad("invalid sample bit length"),
             ParseError::UnexpectedEnd => f.pad("unexpected end of buffer"),
         }
     }