From a5210b21a5114a6622bfb5f092f3bd0f8419c8be Mon Sep 17 00:00:00 2001 From: Dmitry Pentin Date: Tue, 15 Jun 2021 09:31:05 +0300 Subject: [PATCH] Jpeg encoder no uses Numerics.Log2 as fallback --- src/ImageSharp/Common/Helpers/Numerics.cs | 2 +- .../Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ImageSharp/Common/Helpers/Numerics.cs b/src/ImageSharp/Common/Helpers/Numerics.cs index 9d60ac35cd..db65b84cca 100644 --- a/src/ImageSharp/Common/Helpers/Numerics.cs +++ b/src/ImageSharp/Common/Helpers/Numerics.cs @@ -861,7 +861,7 @@ namespace SixLabors.ImageSharp /// https://cstheory.stackexchange.com/questions/19524/using-the-de-bruijn-sequence-to-find-the-lceil-log-2-v-rceil-of-an-integer /// /// The value. - internal static int Log2SoftwareFallback(uint value) + private static int Log2SoftwareFallback(uint value) { // No AggressiveInlining due to large method size // Has conventional contract 0->0 (Log(0) is undefined) by default, no need for if checking diff --git a/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs index df1b4e4686..860a9c3236 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs @@ -420,7 +420,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder // Because of the 16 bit value constraint it won't overflow // With that input value change we no longer need to add 1 before returning // And this eliminates need to check if input value is zero - it is a standard convention which Log2SoftwareFallback adheres to - return Numerics.Log2SoftwareFallback(value << 1); + return Numerics.Log2(value << 1); #endif } }