Integrate upstream changes

src/decoder/ifd.rs

@@ -75,8 +75,7 @@ tags!{
     Predictor 317;
 }
 
-enum_from_primitive! {
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 pub enum Type {
     BYTE = 1,
     ASCII = 2,
@@ -84,7 +83,6 @@ pub enum Type {
     LONG = 4,
     RATIONAL = 5,
 }
-}
 
 
 #[allow(unused_qualifications)]