Skip to content

Commit 02d5694

Browse files
brianpopowbrianpopow
committed
Fix some warnings
1 parent 3a0346f commit 02d5694

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/ImageSharp.Textures/TextureFormats/Decoding/Etc1.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ public byte[] Decompress(byte[] blockData, int width, int height)
4040
byte[] decompressedData = new byte[(width + extraX) * (height + extraY) * 3];
4141
byte[] decodedPixels = new byte[16 * 3];
4242
Span<byte> decodedPixelSpan = decodedPixels.AsSpan();
43-
var blockDataIdx = 0;
43+
int blockDataIdx = 0;
4444

4545
for (int y = 0; y < height; y += 4)
4646
{
4747
for (int x = 0; x < width; x += 4)
4848
{
4949
EtcDecoder.DecodeEtc1Block(blockData.AsSpan(blockDataIdx, 8), decodedPixelSpan);
5050

51-
var decodedPixelSpanIdx = 0;
51+
int decodedPixelSpanIdx = 0;
5252
for (int b = 0; b < 4; b++)
5353
{
5454
for (int a = 0; a < 4; a++)
5555
{
56-
var imageX = x + b;
57-
var imageY = y + a;
58-
var offset = (imageY * width * 3) + (imageX * 3);
56+
int imageX = x + b;
57+
int imageY = y + a;
58+
int offset = (imageY * width * 3) + (imageX * 3);
5959
decompressedData[offset] = decodedPixelSpan[decodedPixelSpanIdx++];
6060
decompressedData[offset + 1] = decodedPixelSpan[decodedPixelSpanIdx++];
6161
decompressedData[offset + 2] = decodedPixelSpan[decodedPixelSpanIdx++];

‎src/ImageSharp.Textures/TextureFormats/Decoding/EtcDecoder.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ internal static class EtcDecoder
3737

3838
public static void DecodeEtc1Block(Span<byte> payload, Span<byte> decodedPixelSpan)
3939
{
40-
var red = payload[0];
41-
var green = payload[1];
42-
var blue = payload[2];
43-
var codeWordsWithFlags = payload[3];
40+
byte red = payload[0];
41+
byte green = payload[1];
42+
byte blue = payload[2];
43+
byte codeWordsWithFlags = payload[3];
4444

4545
bool diffFlag = (codeWordsWithFlags & 2) != 0;
4646
bool flipFlag = (codeWordsWithFlags & 1) != 0;
@@ -83,7 +83,7 @@ public static void DecodeEtc1Block(Span<byte> payload, Span<byte> decodedPixelSp
8383
c1b = c1b4 | (c1b4 << 4);
8484
}
8585

86-
var pixelIndexWord = BinaryPrimitives.ReadUInt32BigEndian(payload.Slice(4, 4));
86+
uint pixelIndexWord = BinaryPrimitives.ReadUInt32BigEndian(payload.Slice(4, 4));
8787

8888
// Check if the sub-blocks are horizontal or vertical.
8989
if (!flipFlag)
@@ -244,10 +244,10 @@ private static void ProcessBlockEtc2PlanarMode(Span<byte> payload, Span<byte> de
244244
{
245245
for (int x = 0; x < 4; x++)
246246
{
247-
var r = (byte)Helper.Clamp(((x * (rh - ro)) + (y * (rv - ro)) + (4 * ro) + 2) >> 2, 0, 255);
248-
var g = (byte)Helper.Clamp(((x * (gh - go)) + (y * (gv - go)) + (4 * go) + 2) >> 2, 0, 255);
249-
var b = (byte)Helper.Clamp(((x * (bh - bo)) + (y * (bv - bo)) + (4 * bo) + 2) >> 2, 0, 255);
250-
var pixelIdx = ((y * 4) + x) * 3;
247+
byte r = (byte)Helper.Clamp(((x * (rh - ro)) + (y * (rv - ro)) + (4 * ro) + 2) >> 2, 0, 255);
248+
byte g = (byte)Helper.Clamp(((x * (gh - go)) + (y * (gv - go)) + (4 * go) + 2) >> 2, 0, 255);
249+
byte b = (byte)Helper.Clamp(((x * (bh - bo)) + (y * (bv - bo)) + (4 * bo) + 2) >> 2, 0, 255);
250+
int pixelIdx = ((y * 4) + x) * 3;
251251
decodedPixelSpan[pixelIdx] = r;
252252
decodedPixelSpan[pixelIdx + 1] = g;
253253
decodedPixelSpan[pixelIdx + 2] = b;
@@ -261,20 +261,20 @@ private static void ProcessBlockEtc2TMode(Span<byte> payload, Span<byte> decoded
261261
int[] paintColorG = new int[4];
262262
int[] paintColorB = new int[4];
263263

264-
var c0r = ((payload[0] & 0x18) >> 1) | (payload[0] & 0x3);
264+
int c0r = ((payload[0] & 0x18) >> 1) | (payload[0] & 0x3);
265265
c0r |= c0r << 4;
266-
var c0g = payload[1] & 0xF0;
266+
int c0g = payload[1] & 0xF0;
267267
c0g |= c0g >> 4;
268-
var c0b = payload[1] & 0x0F;
268+
int c0b = payload[1] & 0x0F;
269269
c0b |= c0b << 4;
270-
var c1r = payload[2] & 0xF0;
270+
int c1r = payload[2] & 0xF0;
271271
c1r |= c1r >> 4;
272-
var c1g = payload[2] & 0x0F;
272+
int c1g = payload[2] & 0x0F;
273273
c1g |= c1g << 4;
274-
var c1b = payload[3] & 0xF0;
274+
int c1b = payload[3] & 0xF0;
275275
c1b |= c1b >> 4;
276276

277-
var distance = Etc2DistanceTable[((payload[3] & 0x0C) >> 1) | (payload[3] & 0x1)];
277+
int distance = Etc2DistanceTable[((payload[3] & 0x0C) >> 1) | (payload[3] & 0x1)];
278278
paintColorR[0] = c0r;
279279
paintColorG[0] = c0g;
280280
paintColorB[0] = c0b;
@@ -289,7 +289,7 @@ private static void ProcessBlockEtc2TMode(Span<byte> payload, Span<byte> decoded
289289
paintColorB[3] = Helper.Clamp(c1b - distance, 0, 255);
290290

291291
uint pixel_index_word = (uint)((payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) | payload[7]);
292-
var decodedPixelIdx = 0;
292+
int decodedPixelIdx = 0;
293293
for (int i = 0; i < 16; i++)
294294
{
295295
uint pixel_index = (uint)(((pixel_index_word & (1 << i)) >> i) | ((pixel_index_word & (0x10000 << i)) >> (16 + i - 1)));
@@ -308,24 +308,24 @@ private static void ProcessBlockEtc2HMode(Span<byte> payload, Span<byte> decoded
308308
int[] paintColorG = new int[4];
309309
int[] paintColorB = new int[4];
310310

311-
var c0r = (payload[0] & 0x78) >> 3;
311+
int c0r = (payload[0] & 0x78) >> 3;
312312
c0r |= c0r << 4;
313-
var c0g = ((payload[0] & 0x07) << 1) | ((payload[1] & 0x10) >> 4);
313+
int c0g = ((payload[0] & 0x07) << 1) | ((payload[1] & 0x10) >> 4);
314314
c0g |= c0g << 4;
315-
var c0b = (payload[1] & 0x08) | ((payload[1] & 0x03) << 1) | ((payload[2] & 0x80) >> 7);
315+
int c0b = (payload[1] & 0x08) | ((payload[1] & 0x03) << 1) | ((payload[2] & 0x80) >> 7);
316316
c0b |= c0b << 4;
317-
var c1r = (payload[2] & 0x78) >> 3;
317+
int c1r = (payload[2] & 0x78) >> 3;
318318
c1r |= c1r << 4;
319-
var c1g = ((payload[2] & 0x07) << 1) | ((payload[3] & 0x80) >> 7);
319+
int c1g = ((payload[2] & 0x07) << 1) | ((payload[3] & 0x80) >> 7);
320320
c1g |= c1g << 4;
321-
var c1b = (payload[3] & 0x78) >> 3;
321+
int c1b = (payload[3] & 0x78) >> 3;
322322
c1b |= c1b << 4;
323323

324324
int baseColor0Value = (c0r << 16) + (c0g << 8) + c0b;
325325
int baseColor1Value = (c1r << 16) + (c1g << 8) + c1b;
326326
int bit = baseColor0Value >= baseColor1Value ? 1 : 0;
327327

328-
var distance = Etc2DistanceTable[(payload[3] & 0x04) | ((payload[3] & 0x01) << 1) | bit];
328+
int distance = Etc2DistanceTable[(payload[3] & 0x04) | ((payload[3] & 0x01) << 1) | bit];
329329
paintColorR[0] = Helper.Clamp(c0r + distance, 0, 255);
330330
paintColorG[0] = Helper.Clamp(c0g + distance, 0, 255);
331331
paintColorB[0] = Helper.Clamp(c0b + distance, 0, 255);
@@ -340,7 +340,7 @@ private static void ProcessBlockEtc2HMode(Span<byte> payload, Span<byte> decoded
340340
paintColorB[3] = Helper.Clamp(c1b - distance, 0, 255);
341341

342342
uint pixel_index_word = (uint)((payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) | payload[7]);
343-
var decodedPixelIdx = 0;
343+
int decodedPixelIdx = 0;
344344
for (int i = 0; i < 16; i++)
345345
{
346346
uint pixel_index = (uint)(((pixel_index_word & (1 << i)) >> i) | ((pixel_index_word & (0x10000 << i)) >> (16 + i - 1)));
@@ -356,7 +356,7 @@ private static void ProcessBlockEtc2HMode(Span<byte> payload, Span<byte> decoded
356356
[MethodImpl(MethodImplOptions.AggressiveInlining)]
357357
private static int FiveToEightBit(int color)
358358
{
359-
var c0r = color | ((color & 0xE0) >> 5);
359+
int c0r = color | ((color & 0xE0) >> 5);
360360
return c0r;
361361
}
362362

@@ -372,7 +372,7 @@ private static int FiveToEightBit(int color)
372372
[MethodImpl(MethodImplOptions.AggressiveInlining)]
373373
private static void ProcessPixelEtc1(int i, uint pixelIndexWord, uint tableCodeword, byte redBaseColorSubBlock, byte greenBaseColorSubBlock, byte blueBaseColorSubBlock, Span<byte> pixelBuffer)
374374
{
375-
var pixelIndex = ((pixelIndexWord & (1 << i)) >> i) | ((pixelIndexWord & (0x10000 << i)) >> (16 + i - 1));
375+
long pixelIndex = ((pixelIndexWord & (1 << i)) >> i) | ((pixelIndexWord & (0x10000 << i)) >> (16 + i - 1));
376376
int modifier = ModifierTable[tableCodeword, pixelIndex];
377377
byte red = (byte)Helper.Clamp(0, redBaseColorSubBlock + modifier, 255);
378378
byte green = (byte)Helper.Clamp(0, greenBaseColorSubBlock + modifier, 255);

0 commit comments

Comments
 (0)