Merge pull request pedrocr#28 from paolobarbolini/enum_primitive_to_e…

…numn Replace enum_primitive with enumn
dnglab · Oct 1, 2020 · 85ceba6 · 85ceba6
2 parents 18c940e + 8233bc4
commit 85ceba6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ build = "data/cameras/join.rs"
 
 [dependencies]
 toml = "0.5"
-enum_primitive = "0.1"
+enumn = "0.1"
 num = "0.3"
 lazy_static = "1"
 byteorder = "1"

diff --git a/src/decoders/ciff.rs b/src/decoders/ciff.rs
@@ -1,10 +1,8 @@
-use enum_primitive::{enum_from_primitive, enum_from_primitive_impl, enum_from_primitive_impl_ty};
 use std::collections::HashMap;
 
 use crate::decoders::basics::*;
 use crate::decoders::Buffer;
 
-enum_from_primitive! {
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum CiffTag {
   Null         = 0x0000,
@@ -20,7 +18,6 @@ pub enum CiffTag {
   SubIFD       = 0x300a,
   Exif         = 0x300b,
 }
-}
 
 fn ct (tag: CiffTag) -> u16 {
   tag as u16

diff --git a/src/decoders/tiff.rs b/src/decoders/tiff.rs
@@ -1,12 +1,11 @@
-use enum_primitive::{enum_from_primitive, enum_from_primitive_impl, enum_from_primitive_impl_ty};
 use num::FromPrimitive;
 use std::collections::HashMap;
 use std::str;
 
 use crate::decoders::basics::*;
 
-enum_from_primitive! {
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, enumn::N)]
+#[repr(u16)]
 pub enum Tag {
   PanaWidth        = 0x0002,
   PanaLength       = 0x0003,
@@ -95,7 +94,6 @@ pub enum Tag {
   KdcLength        = 0xFD01,
   KdcOffset        = 0xFD04,
   KdcIFD           = 0xFE00,
-}
 }
 
                           // 0-1-2-3-4-5-6-7-8-9-10-11-12-13
@@ -202,7 +200,7 @@ impl<'a> TiffIFD<'a> {
     }
     for i in 0..num {
       let entry_offset: usize = offset + 2 + (i as usize)*12;
-      if Tag::from_u16(e.ru16(buf, entry_offset)).is_none() {
+      if Tag::n(e.ru16(buf, entry_offset)).is_none() {
         // Skip entries we don't know about to speedup decoding
         continue;
       }