Skip to content

Commit d566c27

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #571 from SixLabors/js/swap-jpeg-decoders
Swap jpeg decoders
2 parents dbe2b1b + 711844b commit d566c27

101 files changed

Lines changed: 1069 additions & 1088 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/ImageSharp/Formats/Jpeg/Common/Block8x8.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Runtime.InteropServices;
88
using System.Text;
99

10-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common
10+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components
1111
{
1212
/// <summary>
1313
/// Represents a Jpeg block with <see cref="short"/> coefficiens.

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.CopyTo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
using System.Numerics;
55
using System.Runtime.CompilerServices;
6+
67
using SixLabors.ImageSharp.Memory;
78

89
// ReSharper disable InconsistentNaming
9-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common
10+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components
1011
{
1112
internal partial struct Block8x8F
1213
{

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Runtime.CompilerServices;
66

77
// <auto-generated />
8-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common
8+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components
99
{
1010
internal partial struct Block8x8F
1111
{

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt renamed to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using System.Runtime.CompilerServices;
1818
<#
1919
char[] coordz = {'X', 'Y', 'Z', 'W'};
2020
#>
21-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common
21+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components
2222
{
2323
internal partial struct Block8x8F
2424
{

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Text;
1010

1111
// ReSharper disable InconsistentNaming
12-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common
12+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components
1313
{
1414
/// <summary>
1515
/// Represents a Jpeg block with <see cref="float"/> coefficients.
@@ -100,7 +100,7 @@ public float this[int idx]
100100
{
101101
float val = result[i];
102102
val /= value;
103-
result[i] = (float)val;
103+
result[i] = val;
104104
}
105105

106106
return result;
@@ -113,7 +113,7 @@ public float this[int idx]
113113
{
114114
float val = result[i];
115115
val += value;
116-
result[i] = (float)val;
116+
result[i] = val;
117117
}
118118

119119
return result;
@@ -126,7 +126,7 @@ public float this[int idx]
126126
{
127127
float val = result[i];
128128
val -= value;
129-
result[i] = (float)val;
129+
result[i] = val;
130130
}
131131

132132
return result;
@@ -153,7 +153,7 @@ public static Block8x8F Load(Span<int> data)
153153
public void Clear()
154154
{
155155
// The cheapest way to do this in C#:
156-
this = default(Block8x8F);
156+
this = default;
157157
}
158158

159159
/// <summary>

src/ImageSharp/Formats/Jpeg/Common/Decoder/AdobeMarker.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Decoder/AdobeMarker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55

66
// ReSharper disable InconsistentNaming
7-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
7+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
88
{
99
/// <summary>
1010
/// Provides information about the Adobe marker segment.
@@ -78,7 +78,7 @@ public static bool TryParse(byte[] bytes, out AdobeMarker marker)
7878
return true;
7979
}
8080

81-
marker = default(AdobeMarker);
81+
marker = default;
8282
return false;
8383
}
8484

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromCmyk.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmyk.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using System;
55
using System.Numerics;
66

7-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
7+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
88
{
99
internal abstract partial class JpegColorConverter
1010
{
11-
internal class FromCmyk : ColorConverters.JpegColorConverter
11+
internal class FromCmyk : JpegColorConverter
1212
{
1313
public FromCmyk()
1414
: base(JpegColorSpace.Cmyk)
1515
{
1616
}
1717

18-
public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
18+
public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
1919
{
2020
// TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
2121
ReadOnlySpan<float> cVals = values.Component0;

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromGrayScale.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromGrayScale.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using System;
55
using System.Numerics;
66

7-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
7+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
88
{
99
internal abstract partial class JpegColorConverter
1010
{
11-
internal class FromGrayscale : ColorConverters.JpegColorConverter
11+
internal class FromGrayscale : JpegColorConverter
1212
{
1313
public FromGrayscale()
1414
: base(JpegColorSpace.Grayscale)
1515
{
1616
}
1717

18-
public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
18+
public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
1919
{
2020
// TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
2121
ReadOnlySpan<float> yVals = values.Component0;

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromRgb.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgb.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using System;
55
using System.Numerics;
66

7-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
7+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
88
{
99
internal abstract partial class JpegColorConverter
1010
{
11-
internal class FromRgb : ColorConverters.JpegColorConverter
11+
internal class FromRgb : JpegColorConverter
1212
{
1313
public FromRgb()
1414
: base(JpegColorSpace.RGB)
1515
{
1616
}
1717

18-
public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
18+
public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
1919
{
2020
// TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
2121
ReadOnlySpan<float> rVals = values.Component0;

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromYCbCrBasic.cs renamed to src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrBasic.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using System;
55
using System.Numerics;
66

7-
namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
7+
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
88
{
99
internal abstract partial class JpegColorConverter
1010
{
11-
internal class FromYCbCrBasic : ColorConverters.JpegColorConverter
11+
internal class FromYCbCrBasic : JpegColorConverter
1212
{
1313
public FromYCbCrBasic()
1414
: base(JpegColorSpace.YCbCr)
1515
{
1616
}
1717

18-
public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
18+
public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
1919
{
2020
ConvertCore(values, result);
2121
}

0 commit comments

Comments
 (0)
⚡