Derive Clone when deriving Copy

As per rust-lang/rust#23860, Copy now extends
Clone.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

src/gif/encoder.rs

@@ -16,7 +16,7 @@ use super::{Extension, Block, DisposalMethod};
 
 use math::nq;
 
-#[derive(Debug, Copy)]
+#[derive(Debug, Clone, Copy)]
 #[allow(unused_qualifications)]
 /// The color mode the encoder will use to encode the image.
 pub enum ColorMode {

src/image.rs

@@ -94,7 +94,7 @@ pub enum DecodingBuffer<'a> {
 
 /// An enumeration of supported image formats.
 /// Not all formats support both encoding and decoding.
-#[derive(Copy, PartialEq, Eq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub enum ImageFormat {
     /// An Image in PNG Format
     PNG,

src/imageops/colorops.rs

@@ -128,7 +128,7 @@ pub trait ColorMap {
 }
 
 /// A bi-level color map
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub struct BiLevel;
 
 impl ColorMap for BiLevel {

src/imageops/sample.rs

@@ -19,7 +19,7 @@ use image::GenericImage;
 use math::utils::clamp;
 
 /// Available Sampling Filters
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub enum FilterType {
     /// Nearest Neighbor
     Nearest,

src/math/nq.rs

@@ -51,7 +51,7 @@ const BETAGAMMA: f64 = BETA * GAMMA;
 // that it is divisible by all four primes
 const PRIMES: [usize; 4] = [499, 491, 478, 503];
 
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 struct Quad<T> {
     r: T,
     g: T,

src/png/decoder.rs

@@ -20,7 +20,7 @@ use super::zlib::ZlibDecoder;
 pub static PNGSIGNATURE: [u8; 8] = [137, 80, 78, 71, 13, 10, 26, 10];
 
 
-#[derive(Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq)]
 enum PNGState {
     Start,
     HaveSignature,
@@ -33,7 +33,7 @@ enum PNGState {
     HaveIEND
 }
 
-#[derive(Copy, FromPrimitive, Debug, PartialEq)]
+#[derive(Clone, Copy, FromPrimitive, Debug, PartialEq)]
 enum InterlaceMethod {
     None = 0,
     Adam7 = 1
@@ -51,7 +51,7 @@ enum InterlaceMethod {
 ///     56565656
 ///     77777777
 ///
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 struct Adam7Iterator {
     line: u32,
     lines: u32,

src/png/hash.rs

@@ -6,7 +6,7 @@
 //! *http://en.wikipedia.org/wiki/Cyclic_redundancy_check - Cyclic Redundancy Check
 
 /// An Implementation of the Adler-32 checksum
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub struct Adler32 {
     s1: u32,
     s2: u32
@@ -97,7 +97,7 @@ const CRC_TABLE: [u32; 256] = [
 ];
 
 /// An Implementation of the Crc-32 checksum
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub struct Crc32 {
     crc: u32,
 }

src/tiff/decoder.rs

@@ -26,7 +26,7 @@ use super::stream::{
     LZWReader
 };
 
-#[derive(Copy, Debug, FromPrimitive, PartialEq)]
+#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq)]
 enum PhotometricInterpretation {
     WhiteIsZero = 0,
     BlackIsZero = 1,
@@ -38,7 +38,7 @@ enum PhotometricInterpretation {
     CIELab = 8,
 }
 
-#[derive(Copy, Debug, FromPrimitive)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum CompressionMethod {
     None = 1,
     Huffman = 2,
@@ -49,13 +49,13 @@ enum CompressionMethod {
     PackBits = 32773
 }
 
-#[derive(Copy, Debug, FromPrimitive)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum PlanarConfiguration {
     Chunky = 1,
     Planar = 2
 }
 
-#[derive(Copy, Debug, FromPrimitive)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 enum Predictor {
     None = 1,
     Horizontal = 2

src/tiff/ifd.rs

@@ -14,7 +14,7 @@ macro_rules! tags {
     )*} => {
 
         /// TIFF tag
-        #[derive(Copy, PartialEq, Eq, Debug, Hash)]
+        #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
         pub enum Tag {
             $($tag,)*
             Unknown(u16)
@@ -74,7 +74,7 @@ tags!{
     Predictor 317;
 }
 
-#[derive(Copy, Debug, FromPrimitive)]
+#[derive(Clone, Copy, Debug, FromPrimitive)]
 pub enum Type {
     BYTE = 1,
     ASCII = 2,

src/tiff/stream.rs

@@ -6,7 +6,7 @@ use byteorder::{self, ReadBytesExt, BigEndian, LittleEndian};
 use utils::{lzw, bitstream};
 
 /// Byte order of the TIFF file.
-#[derive(Copy, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub enum ByteOrder {
     /// little endian byte order
     LittleEndian,

src/webp/vp8.rs

@@ -728,7 +728,7 @@ impl BoolReader {
     }
 }
 
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 struct MacroBlock {
     bpred:       [i8; 16],
     complexity:  [u8; 9],
@@ -780,7 +780,7 @@ pub struct Frame {
     sharpness_level: u8,
 }
 
-#[derive(Copy, Default)]
+#[derive(Clone, Copy, Default)]
 struct Segment {
     ydc: i16,
     yac: i16,