Integrate upstream changes

src/decoder/mod.rs

@@ -35,8 +35,7 @@ enum DecodingBuffer<'a> {
     U16(&'a mut [u16])
 }
 
-enum_from_primitive! {
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, FromPrimitive)]
 enum PhotometricInterpretation {
     WhiteIsZero = 0,
     BlackIsZero = 1,
@@ -47,10 +46,8 @@ enum PhotometricInterpretation {
     YCbCr = 6,
     CIELab = 8,
 }
-}
 
-enum_from_primitive! {
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum CompressionMethod {
     None = 1,
     Huffman = 2,
@@ -60,23 +57,18 @@ enum CompressionMethod {
     JPEG = 6,
     PackBits = 0x8005
 }
-}
 
-enum_from_primitive! {
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum PlanarConfiguration {
     Chunky = 1,
     Planar = 2
 }
-}
 
-enum_from_primitive! {
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum Predictor {
     None = 1,
     Horizontal = 2
 }
-}
 
 /// The representation of a TIFF decoder
 ///
@@ -179,7 +171,7 @@ impl<R: Read + Seek> Decoder<R> {
                                            if self.bits_per_sample.len() == 1 => Ok(ColorType::Gray(self.bits_per_sample[0])),
 
             _ => Err(TiffError::UnsupportedError(format!(
-                "{:?} with {:?} bits per sample is unsupported", self.bits_per_sample, self.photometric_interpretation
+                "{:?} with {:?} bits per sample is unsupported", self.photometric_interpretation, self.bits_per_sample
             ))) // TODO: this is bad we should not fail at this point}
         }
     }