Removed obsolete/redundant/unused code from Block8x8F

src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -98,58 +97,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
             set => this[(y * 8) + x] = value;
         }
 
-        public static Block8x8F operator *(Block8x8F block, float value)
-        {
-            Block8x8F result = block;
-            for (int i = 0; i < Size; i++)
-            {
-                float val = result[i];
-                val *= value;
-                result[i] = val;
-            }
-
-            return result;
-        }
-
-        public static Block8x8F operator /(Block8x8F block, float value)
-        {
-            Block8x8F result = block;
-            for (int i = 0; i < Size; i++)
-            {
-                float val = result[i];
-                val /= value;
-                result[i] = val;
-            }
-
-            return result;
-        }
-
-        public static Block8x8F operator +(Block8x8F block, float value)
-        {
-            Block8x8F result = block;
-            for (int i = 0; i < Size; i++)
-            {
-                float val = result[i];
-                val += value;
-                result[i] = val;
-            }
-
-            return result;
-        }
-
-        public static Block8x8F operator -(Block8x8F block, float value)
-        {
-            Block8x8F result = block;
-            for (int i = 0; i < Size; i++)
-            {
-                float val = result[i];
-                val -= value;
-                result[i] = val;
-            }
-
-            return result;
-        }
-
         public static Block8x8F Load(Span<float> data)
         {
             Block8x8F result = default;
@@ -177,15 +124,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
             Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));
         }
 
-        /// <summary>
-        /// Load raw 32bit floating point data from source.
-        /// </summary>
-        /// <param name="blockPtr">Block pointer</param>
-        /// <param name="source">Source</param>
-        [MethodImpl(InliningOptions.ShortMethod)]
-        public static unsafe void LoadFrom(Block8x8F* blockPtr, Span<float> source)
-            => blockPtr->LoadFrom(source);
-
         /// <summary>
         /// Load raw 32bit floating point data from source
         /// </summary>
@@ -202,44 +140,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
             }
         }
 
-        /// <summary>
-        /// Copy raw 32bit floating point data to dest,
-        /// </summary>
-        /// <param name="dest">Destination</param>
-        [MethodImpl(InliningOptions.ShortMethod)]
-        public void ScaledCopyTo(Span<float> dest)
-        {
-            ref byte d = ref Unsafe.As<float, byte>(ref MemoryMarshal.GetReference(dest));
-            ref byte s = ref Unsafe.As<Block8x8F, byte>(ref this);
-
-            Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));
-        }
-
-        /// <summary>
-        /// Convert scalars to byte-s and copy to dest,
-        /// </summary>
-        /// <param name="blockPtr">Pointer to block</param>
-        /// <param name="dest">Destination</param>
-        [MethodImpl(InliningOptions.ShortMethod)]
-        public static unsafe void ScaledCopyTo(Block8x8F* blockPtr, Span<byte> dest)
-        {
-            float* fPtr = (float*)blockPtr;
-            for (int i = 0; i < Size; i++)
-            {
-                dest[i] = (byte)*fPtr;
-                fPtr++;
-            }
-        }
-
-        /// <summary>
-        /// Copy raw 32bit floating point data to dest.
-        /// </summary>
-        /// <param name="blockPtr">The block pointer.</param>
-        /// <param name="dest">The destination.</param>
-        [MethodImpl(InliningOptions.ShortMethod)]
-        public static unsafe void ScaledCopyTo(Block8x8F* blockPtr, Span<float> dest)
-            => blockPtr->ScaledCopyTo(dest);
-
         /// <summary>
         /// Copy raw 32bit floating point data to dest
         /// </summary>
@@ -253,22 +153,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
             }
         }
 
-        /// <summary>
-        /// Copy raw 32bit floating point data to dest
-        /// </summary>
-        /// <param name="dest">Destination</param>
-        public unsafe void ScaledCopyTo(Span<int> dest)
-        {
-            fixed (Vector4* ptr = &this.V0L)
-            {
-                var fp = (float*)ptr;
-                for (int i = 0; i < Size; i++)
-                {
-                    dest[i] = (int)fp[i];
-                }
-            }
-        }
-
         public float[] ToArray()
         {
             float[] result = new float[Size];

tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@@ -114,56 +114,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             // PrintLinearData((Span<float>)mirror);
         }
 
-        [Fact]
-        public unsafe void Load_Store_FloatArray_Ptr()
-        {
-            float[] data = new float[Block8x8F.Size];
-            float[] mirror = new float[Block8x8F.Size];
-
-            for (int i = 0; i < Block8x8F.Size; i++)
-            {
-                data[i] = i;
-            }
-
-            this.Measure(
-                Times,
-                () =>
-                {
-                    var b = default(Block8x8F);
-                    Block8x8F.LoadFrom(&b, data);
-                    Block8x8F.ScaledCopyTo(&b, mirror);
-                });
-
-            Assert.Equal(data, mirror);
-
-            // PrintLinearData((Span<float>)mirror);
-        }
-
-        [Fact]
-        public void Load_Store_IntArray()
-        {
-            int[] data = new int[Block8x8F.Size];
-            int[] mirror = new int[Block8x8F.Size];
-
-            for (int i = 0; i < Block8x8F.Size; i++)
-            {
-                data[i] = i;
-            }
-
-            this.Measure(
-                Times,
-                () =>
-                {
-                    var v = default(Block8x8F);
-                    v.LoadFrom(data);
-                    v.ScaledCopyTo(mirror);
-                });
-
-            Assert.Equal(data, mirror);
-
-            // PrintLinearData((Span<int>)mirror);
-        }
-
         [Fact]
         public void TransposeInplace()
         {

tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs

@@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 Block8x8F expected = ReferenceImplementations.AccurateDCT.TransformFDCT(ref source);
                 Block8x8F actual = ReferenceImplementations.LLM_FloatingPoint_DCT.TransformFDCT_UpscaleBy8(ref source);
-                actual /= 8;
+                actual.MultiplyInPlace(0.125f);
 
                 this.CompareBlocks(expected, actual, 1f);
             }

tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs

@@ -51,11 +51,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 Block8x8F expected = ReferenceImplementations.AccurateDCT.TransformFDCT(ref source);
 
-                source += 128;
+                source.AddInPlace(128f);
                 Block8x8 temp = source.RoundAsInt16Block();
                 Block8x8 actual8 = ReferenceImplementations.StandardIntegerDCT.Subtract128_TransformFDCT_Upscale8(ref temp);
                 Block8x8F actual = actual8.AsFloatBlock();
-                actual /= 8;
+                actual.MultiplyInPlace(0.125f);
 
                 this.CompareBlocks(expected, actual, 1f);
             }