Skip to content

Commit 899bd45

Browse files
Fix build
1 parent 9f95cd7 commit 899bd45

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/AxisValueMapRecord.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public static AxisValueMapRecord Load(BigEndianBinaryReader reader)
2525
// +-----------------+----------------------------------------+-------------------------------------------------------------------------+
2626
// | F2DOT14 | toCoordinate | The modified, normalized coordinate value. |
2727
// +-----------------+----------------------------------------+-------------------------------------------------------------------------+
28-
float fromCoordinate = reader.ReadF2dot14();
29-
float toCoordinate = reader.ReadF2dot14();
28+
float fromCoordinate = reader.ReadF2Dot14();
29+
float toCoordinate = reader.ReadF2Dot14();
3030

3131
return new AxisValueMapRecord(fromCoordinate, toCoordinate);
3232
}

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/GVarTable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static GVarTable Load(BigEndianBinaryReader reader)
9595
{
9696
for (int j = 0; j < axisCount; j++)
9797
{
98-
sharedTuples[i, j] = reader.ReadF2dot14();
98+
sharedTuples[i, j] = reader.ReadF2Dot14();
9999
}
100100
}
101101

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/GlyphVariationProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public GlyphVariationProcessor(ItemVariationStore itemStore, FVarTable fVar, AVa
4848
this.gVar = gVar;
4949
this.hVar = hVar;
5050
this.normalizedCoords = this.NormalizeDefaultCoords();
51-
this.blendVectors = new Dictionary<ItemVariationData, float[]>();
51+
this.blendVectors = [];
5252
}
5353

5454
public void TransformPoints(ushort glyphId, ref GlyphVector glyphPoints)

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/HVarTable.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Six Labors Split License.
33

4-
using System;
5-
64
namespace SixLabors.Fonts.Tables.AdvancedTypographic.Variations;
75

86
/// <summary>
@@ -78,7 +76,7 @@ public static HVarTable Load(BigEndianBinaryReader reader)
7876
throw new NotSupportedException("Only version 1 of hvar table is supported");
7977
}
8078

81-
var itemVariationStore = ItemVariationStore.Load(reader, itemVariationStoreOffset);
79+
ItemVariationStore itemVariationStore = ItemVariationStore.Load(reader, itemVariationStoreOffset);
8280

8381
DeltaSetIndexMap[] advanceWidthMapping = DeltaSetIndexMap.Load(reader, advanceWidthMappingOffset);
8482
DeltaSetIndexMap[] lsbMapping = DeltaSetIndexMap.Load(reader, lsbMappingOffset);

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/ItemVariationStore.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Six Labors Split License.
33

4-
using System.IO;
5-
64
namespace SixLabors.Fonts.Tables.AdvancedTypographic.Variations;
75

86
/// <summary>
@@ -53,7 +51,7 @@ public static ItemVariationStore Load(BigEndianBinaryReader reader, long offset,
5351
throw new InvalidFontFileException("Invalid variation region list offset");
5452
}
5553

56-
var itemVariations = new ItemVariationData[itemVariationDataCount];
54+
ItemVariationData[] itemVariations = new ItemVariationData[itemVariationDataCount];
5755
long itemVariationsOffset = reader.BaseStream.Position;
5856
for (int i = 0; i < itemVariationDataCount; i++)
5957
{
@@ -64,13 +62,12 @@ public static ItemVariationStore Load(BigEndianBinaryReader reader, long offset,
6462
throw new InvalidFontFileException("Bad offset to variation data subtable");
6563
}
6664

67-
var itemVariationData = ItemVariationData.Load(reader, offset + variationDataOffset);
68-
itemVariations[i] = itemVariationData;
65+
itemVariations[i] = ItemVariationData.Load(reader, offset + variationDataOffset);
6966

7067
reader.BaseStream.Position = itemVariationsOffset;
7168
}
7269

73-
var variationRegionList = VariationRegionList.Load(reader, offset + variationRegionListOffset);
70+
VariationRegionList variationRegionList = VariationRegionList.Load(reader, offset + variationRegionListOffset);
7471

7572
return new ItemVariationStore(variationRegionList, itemVariations);
7673
}

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/TupleVariation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static TupleVariation Load(BigEndianBinaryReader reader, int axisCount)
8282
embeddedPeak = new float[axisCount];
8383
for (int i = 0; i < axisCount; i++)
8484
{
85-
embeddedPeak[i] = reader.ReadF2dot14();
85+
embeddedPeak[i] = reader.ReadF2Dot14();
8686
bytesRead += 2;
8787
}
8888
}
@@ -94,14 +94,14 @@ public static TupleVariation Load(BigEndianBinaryReader reader, int axisCount)
9494
intermediateStartRegion = new float[axisCount];
9595
for (int i = 0; i < axisCount; i++)
9696
{
97-
intermediateStartRegion[i] = reader.ReadF2dot14();
97+
intermediateStartRegion[i] = reader.ReadF2Dot14();
9898
bytesRead += 2;
9999
}
100100

101101
intermediateEndRegion = new float[axisCount];
102102
for (int i = 0; i < axisCount; i++)
103103
{
104-
intermediateEndRegion[i] = reader.ReadF2dot14();
104+
intermediateEndRegion[i] = reader.ReadF2Dot14();
105105
bytesRead += 2;
106106
}
107107
}

src/SixLabors.Fonts/Tables/AdvancedTypographic/Variations/VariationRegionList.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public static VariationRegionList Load(BigEndianBinaryReader reader, long offset
5555
variationRegions[i] = new RegionAxisCoordinates[axisCount];
5656
for (int j = 0; j < axisCount; j++)
5757
{
58-
float startCoord = reader.ReadF2dot14();
59-
float peakCoord = reader.ReadF2dot14();
60-
float endCoord = reader.ReadF2dot14();
58+
float startCoord = reader.ReadF2Dot14();
59+
float peakCoord = reader.ReadF2Dot14();
60+
float endCoord = reader.ReadF2Dot14();
6161

6262
if (startCoord > peakCoord || peakCoord > endCoord)
6363
{

0 commit comments

Comments
 (0)