Merge pull request #1026 from brianpopow/feature/tga

Add support for decoding and encoding of TGA images

Author: JimBobSquarePants

.gitattributes

@@ -93,6 +93,7 @@
 *.gif               binary
 *.jpg               binary
 *.png               binary
+*.tga               binary
 *.ttf               binary
 *.snk               binary
 

Directory.Build.targets

@@ -24,7 +24,7 @@
   <ItemGroup>
     <PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Update="Colourful" Version="2.0.2" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.12.0" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.14.4" />
     <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.3.1" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Update="Moq" Version="4.10.0" />

src/ImageSharp/Common/Helpers/ImageMaths.cs

@@ -1,7 +1,8 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 using SixLabors.ImageSharp.PixelFormats;
@@ -14,6 +15,20 @@ namespace SixLabors.ImageSharp
     /// </summary>
     internal static class ImageMaths
     {
+        /// <summary>
+        /// Vector for converting pixel to gray value as specified by ITU-R Recommendation BT.709.
+        /// </summary>
+        private static readonly Vector4 Bt709 = new Vector4(.2126f, .7152f, .0722f, 0.0f);
+
+        /// <summary>
+        /// Convert a pixel value to grayscale using ITU-R Recommendation BT.709.
+        /// </summary>
+        /// <param name="vector">The vector to get the luminance from.</param>
+        /// <param name="luminanceLevels">The number of luminance levels (256 for 8 bit, 65536 for 16 bit grayscale images)</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static int GetBT709Luminance(ref Vector4 vector, int luminanceLevels)
+            => (int)MathF.Round(Vector4.Dot(vector, Bt709) * (luminanceLevels - 1));
+
         /// <summary>
         /// Gets the luminance from the rgb components using the formula as specified by ITU-R Recommendation BT.709.
         /// </summary>

src/ImageSharp/Configuration.cs

@@ -8,6 +8,7 @@
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Formats.Tga;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.Memory;
@@ -150,6 +151,7 @@ public Configuration Clone()
         /// <see cref="JpegConfigurationModule"/>
         /// <see cref="GifConfigurationModule"/>
         /// <see cref="BmpConfigurationModule"/>.
+        /// <see cref="TgaConfigurationModule"/>.
         /// </summary>
         /// <returns>The default configuration of <see cref="Configuration"/>.</returns>
         internal static Configuration CreateDefaultInstance()
@@ -158,7 +160,8 @@ internal static Configuration CreateDefaultInstance()
                 new PngConfigurationModule(),
                 new JpegConfigurationModule(),
                 new GifConfigurationModule(),
-                new BmpConfigurationModule());
+                new BmpConfigurationModule(),
+                new TgaConfigurationModule());
         }
     }
 }

src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs

@@ -387,9 +387,10 @@ private void ReadRle24<TPixel>(Buffer2D<TPixel> pixels, int width, int height, b
                     if (rowHasUndefinedPixels)
                     {
                         // Slow path with undefined pixels.
+                        int rowStartIdx = y * width * 3;
                         for (int x = 0; x < width; x++)
                         {
-                            int idx = (y * width * 3) + (x * 3);
+                            int idx = rowStartIdx + (x * 3);
                             if (undefinedPixels[x, y])
                             {
                                 switch (this.options.RleSkippedPixelHandling)
@@ -418,9 +419,10 @@ private void ReadRle24<TPixel>(Buffer2D<TPixel> pixels, int width, int height, b
                     else
                     {
                         // Fast path without any undefined pixels.
+                        int rowStartIdx = y * width * 3;
                         for (int x = 0; x < width; x++)
                         {
-                            int idx = (y * width * 3) + (x * 3);
+                            int idx = rowStartIdx + (x * 3);
                             color.FromBgr24(Unsafe.As<byte, Bgr24>(ref bufferSpan[idx]));
                             pixelRow[x] = color;
                         }

src/ImageSharp/Formats/README.md

@@ -0,0 +1,6 @@
+# Encoder/Decoder for true vision targa files
+
+Useful links for reference:
+
+- [FileFront](https://www.fileformat.info/format/tga/egff.htm)
+- [Tga Specification](http://www.dca.fee.unicamp.br/~martino/disciplinas/ea978/tgaffs.pdf)

src/ImageSharp/Formats/Tga/ITgaDecoderOptions.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Formats.Tga
+{
+    /// <summary>
+    /// The options for decoding tga images. Currently empty, but this may change in the future.
+    /// </summary>
+    internal interface ITgaDecoderOptions
+    {
+    }
+}

src/ImageSharp/Formats/Tga/ITgaEncoderOptions.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Formats.Tga
+{
+    /// <summary>
+    /// Configuration options for use during tga encoding.
+    /// </summary>
+    internal interface ITgaEncoderOptions
+    {
+        /// <summary>
+        /// Gets the number of bits per pixel.
+        /// </summary>
+        TgaBitsPerPixel? BitsPerPixel { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether run length compression should be used.
+        /// </summary>
+        TgaCompression Compression { get; }
+    }
+}

src/ImageSharp/Formats/Tga/TGA_Specification.pdf

@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Formats.Tga
+{
+    /// <summary>
+    /// Enumerates the available bits per pixel the tga encoder supports.
+    /// </summary>
+    public enum TgaBitsPerPixel : byte
+    {
+        /// <summary>
+        /// 8 bits per pixel. Each pixel consists of 1 byte.
+        /// </summary>
+        Pixel8 = 8,
+
+        /// <summary>
+        /// 16 bits per pixel. Each pixel consists of 2 bytes.
+        /// </summary>
+        Pixel16 = 16,
+
+        /// <summary>
+        /// 24 bits per pixel. Each pixel consists of 3 bytes.
+        /// </summary>
+        Pixel24 = 24,
+
+        /// <summary>
+        /// 32 bits per pixel. Each pixel consists of 4 bytes.
+        /// </summary>
+        Pixel32 = 32
+    }
+}