From bfc4a685514460121cfd88d15ec7c526cdc2914d Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Wed, 18 Apr 2018 12:10:35 -0700
Subject: [PATCH] Make ImageMetaData(ImageMetaData other) constructor private

Ensure we use the Clone() method. This also lets us remove the nullability check.
---
 src/ImageSharp/MetaData/ImageMetaData.cs       |  4 +---
 .../MetaData/ImageMetaDataTests.cs             | 18 ++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp/MetaData/ImageMetaData.cs b/src/ImageSharp/MetaData/ImageMetaData.cs
index df114ce9fb..01b53a3fdf 100644
--- a/src/ImageSharp/MetaData/ImageMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageMetaData.cs
@@ -43,10 +43,8 @@ namespace SixLabors.ImageSharp.MetaData
         /// <param name="other">
         /// The other <see cref="ImageMetaData"/> to create this instance from.
         /// </param>
-        internal ImageMetaData(ImageMetaData other)
+        private ImageMetaData(ImageMetaData other)
         {
-            DebugGuard.NotNull(other, nameof(other));
-
             this.HorizontalResolution = other.HorizontalResolution;
             this.VerticalResolution = other.VerticalResolution;
             this.RepeatCount = other.RepeatCount;
diff --git a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
index 43c53570a1..255451e0e6 100644
--- a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
@@ -20,10 +18,10 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void ConstructorImageMetaData()
         {
-            ImageMetaData metaData = new ImageMetaData();
+            var metaData = new ImageMetaData();
 
-            ExifProfile exifProfile = new ExifProfile();
-            ImageProperty imageProperty = new ImageProperty("name", "value");
+            var exifProfile = new ExifProfile();
+            var imageProperty = new ImageProperty("name", "value");
 
             metaData.ExifProfile = exifProfile;
             metaData.HorizontalResolution = 4;
@@ -31,7 +29,7 @@ namespace SixLabors.ImageSharp.Tests
             metaData.Properties.Add(imageProperty);
             metaData.RepeatCount = 1;
 
-            ImageMetaData clone = new ImageMetaData(metaData);
+            ImageMetaData clone = metaData.Clone();
 
             Assert.Equal(exifProfile.ToByteArray(), clone.ExifProfile.ToByteArray());
             Assert.Equal(4, clone.HorizontalResolution);
@@ -43,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void HorizontalResolution()
         {
-            ImageMetaData metaData = new ImageMetaData();
+            var metaData = new ImageMetaData();
             Assert.Equal(96, metaData.HorizontalResolution);
 
             metaData.HorizontalResolution=0;
@@ -59,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void VerticalResolution()
         {
-            ImageMetaData metaData = new ImageMetaData();
+            var metaData = new ImageMetaData();
             Assert.Equal(96, metaData.VerticalResolution);
 
             metaData.VerticalResolution = 0;
@@ -75,11 +73,11 @@ namespace SixLabors.ImageSharp.Tests
         [Fact]
         public void SyncProfiles()
         {
-            ExifProfile exifProfile = new ExifProfile();
+            var exifProfile = new ExifProfile();
             exifProfile.SetValue(ExifTag.XResolution, new Rational(200));
             exifProfile.SetValue(ExifTag.YResolution, new Rational(300));
 
-            Image<Rgba32> image = new Image<Rgba32>(1, 1);
+            var image = new Image<Rgba32>(1, 1);
             image.MetaData.ExifProfile = exifProfile;
             image.MetaData.HorizontalResolution = 400;
             image.MetaData.VerticalResolution = 500;