Merge branch 'master' into js/fix-resize-namespace

appveyor.yml

@@ -1,5 +1,5 @@
 version: 1.0.0.{build}
-image: Visual Studio 2017
+image: Visual Studio 2017 Preview
 
 # prevent the double build when a branch has an active PR
 skip_branch_with_pr: true

src/ImageSharp/Formats/Png/Filters/NoneFilter.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
@@ -25,7 +24,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
             // Insert a byte before the data.
             result[0] = 0;
             result = result.Slice(1);
-            SpanHelper.Copy(scanline, result);
+            scanline.Slice(0, Math.Min(scanline.Length, result.Length)).CopyTo(result);
         }
     }
-}
+}

src/ImageSharp/Memory/SpanHelper.cs

@@ -1,48 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.Memory
-{
-    /// <summary>
-    /// Utility methods for <see cref="Span{T}"/>
-    /// </summary>
-    internal static class SpanHelper
-    {
-        /// <summary>
-        /// Copy all elements of 'source' into 'destination'.
-        /// </summary>
-        /// <typeparam name="T">The element type.</typeparam>
-        /// <param name="source">The <see cref="Span{T}"/> to copy elements from.</param>
-        /// <param name="destination">The destination <see cref="Span{T}"/>.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Copy<T>(ReadOnlySpan<T> source, Span<T> destination)
-            where T : struct
-        {
-            source.Slice(0, Math.Min(source.Length, destination.Length)).CopyTo(destination);
-        }
-
-        /// <summary>
-        /// Gets the size of `count` elements in bytes.
-        /// </summary>
-        /// <typeparam name="T">The element type.</typeparam>
-        /// <param name="count">The count of the elements</param>
-        /// <returns>The size in bytes as int</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int SizeOf<T>(int count)
-            where T : struct => Unsafe.SizeOf<T>() * count;
-
-        /// <summary>
-        /// Gets the size of `count` elements in bytes as UInt32
-        /// </summary>
-        /// <typeparam name="T">The element type.</typeparam>
-        /// <param name="count">The count of the elements</param>
-        /// <returns>The size in bytes as UInt32</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static uint USizeOf<T>(int count)
-            where T : struct
-            => (uint)SizeOf<T>(count);
-    }
-}

src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs

@@ -387,7 +387,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 value = this.ConvertValue(dataType, offsetBuffer, numberOfComponents);
             }
 
-            exifValue = new ExifValue(tag, dataType, value, isArray: value != null && numberOfComponents > 1);
+            exifValue = new ExifValue(tag, dataType, value, isArray: value != null && numberOfComponents != 1);
 
             return true;
         }

tests/ImageSharp.Tests/ConfigurationTests.cs

@@ -1,95 +1,95 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.IO;
-using SixLabors.ImageSharp.PixelFormats;
-using Moq;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests
-{
-    /// <summary>
-    /// Tests the configuration class.
-    /// </summary>
-    public class ConfigurationTests
-    {
-        public Configuration ConfigurationEmpty { get; private set; }
-        public Configuration DefaultConfiguration { get; private set; }
-
-        public ConfigurationTests()
-        {
-            // the shallow copy of configuration should behave exactly like the default configuration,
-            // so by using the copy, we test both the default and the copy.
-            this.DefaultConfiguration = Configuration.CreateDefaultInstance().ShallowCopy();
-            this.ConfigurationEmpty = new Configuration();
-        }
-
-        [Fact]
-        public void DefaultsToLocalFileSystem()
-        {
-            Assert.IsType<LocalFileSystem>(this.DefaultConfiguration.FileSystem);
-            Assert.IsType<LocalFileSystem>(this.ConfigurationEmpty.FileSystem);
-        }
-
-        /// <summary>
-        /// Test that the default configuration is not null.
-        /// </summary>
-        [Fact]
-        public void TestDefultConfigurationIsNotNull()
-        {
-            Assert.True(Configuration.Default != null);
-        }
-
-        /// <summary>
-        /// Test that the default configuration parallel options is not null.
-        /// </summary>
-        [Fact]
-        public void TestDefultConfigurationParallelOptionsIsNotNull()
-        {
-            Assert.True(Configuration.Default.ParallelOptions != null);
-        }
-
-        /// <summary>
-        /// Test that the default configuration read origin options is set to begin.
-        /// </summary>
-        [Fact]
-        public void TestDefultConfigurationReadOriginIsCurrent()
-        {
-            Assert.True(Configuration.Default.ReadOrigin == ReadOrigin.Current);
-        }
-
-        /// <summary>
-        /// Test that the default configuration parallel options max degrees of parallelism matches the
-        /// environment processor count.
-        /// </summary>
-        [Fact]
-        public void TestDefultConfigurationMaxDegreeOfParallelism()
-        {
-            Assert.True(Configuration.Default.ParallelOptions.MaxDegreeOfParallelism == Environment.ProcessorCount);
-        }
-
-        [Fact]
-        public void ConstructorCallConfigureOnFormatProvider()
-        {
-            var provider = new Mock<IConfigurationModule>();
-            var config = new Configuration(provider.Object);
-
-            provider.Verify(x => x.Configure(config));
-        }
-
-        [Fact]
-        public void AddFormatCallsConfig()
-        {
-            var provider = new Mock<IConfigurationModule>();
-            var config = new Configuration();
-            config.Configure(provider.Object);
-
-            provider.Verify(x => x.Configure(config));
-        }
-    }
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.IO;
+using SixLabors.ImageSharp.PixelFormats;
+using Moq;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests
+{
+    /// <summary>
+    /// Tests the configuration class.
+    /// </summary>
+    public class ConfigurationTests
+    {
+        public Configuration ConfigurationEmpty { get; private set; }
+        public Configuration DefaultConfiguration { get; private set; }
+
+        public ConfigurationTests()
+        {
+            // the shallow copy of configuration should behave exactly like the default configuration,
+            // so by using the copy, we test both the default and the copy.
+            this.DefaultConfiguration = Configuration.CreateDefaultInstance().ShallowCopy();
+            this.ConfigurationEmpty = new Configuration();
+        }
+
+        [Fact]
+        public void DefaultsToLocalFileSystem()
+        {
+            Assert.IsType<LocalFileSystem>(this.DefaultConfiguration.FileSystem);
+            Assert.IsType<LocalFileSystem>(this.ConfigurationEmpty.FileSystem);
+        }
+
+        /// <summary>
+        /// Test that the default configuration is not null.
+        /// </summary>
+        [Fact]
+        public void TestDefaultConfigurationIsNotNull()
+        {
+            Assert.True(Configuration.Default != null);
+        }
+
+        /// <summary>
+        /// Test that the default configuration parallel options is not null.
+        /// </summary>
+        [Fact]
+        public void TestDefaultConfigurationParallelOptionsIsNotNull()
+        {
+            Assert.True(Configuration.Default.ParallelOptions != null);
+        }
+
+        /// <summary>
+        /// Test that the default configuration read origin options is set to begin.
+        /// </summary>
+        [Fact]
+        public void TestDefaultConfigurationReadOriginIsCurrent()
+        {
+            Assert.True(Configuration.Default.ReadOrigin == ReadOrigin.Current);
+        }
+
+        /// <summary>
+        /// Test that the default configuration parallel options max degrees of parallelism matches the
+        /// environment processor count.
+        /// </summary>
+        [Fact]
+        public void TestDefaultConfigurationMaxDegreeOfParallelism()
+        {
+            Assert.True(Configuration.Default.ParallelOptions.MaxDegreeOfParallelism == Environment.ProcessorCount);
+        }
+
+        [Fact]
+        public void ConstructorCallConfigureOnFormatProvider()
+        {
+            var provider = new Mock<IConfigurationModule>();
+            var config = new Configuration(provider.Object);
+
+            provider.Verify(x => x.Configure(config));
+        }
+
+        [Fact]
+        public void AddFormatCallsConfig()
+        {
+            var provider = new Mock<IConfigurationModule>();
+            var config = new Configuration();
+            config.Configure(provider.Object);
+
+            provider.Verify(x => x.Configure(config));
+        }
+    }
 }

tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs

@@ -292,6 +292,22 @@ namespace SixLabors.ImageSharp.Tests
             }
         }
 
+        [Fact]
+        public void TestArrayValueWithUnspecifiedSize()
+        {
+            // This images contains array in the exif profile that has zero components.
+            Image<Rgba32> image = TestFile.Create(TestImages.Jpeg.Issues.InvalidCast520).CreateImage();
+
+            ExifProfile profile = image.MetaData.ExifProfile;
+            Assert.NotNull(profile);
+
+            // Force parsing of the profile.
+            Assert.Equal(24, profile.Values.Count);
+
+            byte[] bytes = profile.ToByteArray();
+            Assert.Equal(495, bytes.Length);
+        }
+
         private static ExifProfile GetExifProfile()
         {
             Image<Rgba32> image = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan).CreateImage();

tests/ImageSharp.Tests/TestImages.cs

@@ -136,6 +136,7 @@ namespace SixLabors.ImageSharp.Tests
                 public const string MultiHuffmanBaseline394 = "Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg";
                 public const string NoEoiProgressive517 = "Jpg/issues/Issue517-No-EOI-Progressive.jpg";
                 public const string BadRstProgressive518 = "Jpg/issues/Issue518-Bad-RST-Progressive.jpg";
+                public const string InvalidCast520 = "Jpg/issues/Issue520-InvalidCast.jpg";
             }
 
             public static readonly string[] All = Baseline.All.Concat(Progressive.All).ToArray();