Skip to content

Commit 924e267

Browse files
committed
Fix warnings
1 parent aeff731 commit 924e267

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

BCnEnc.Net/Encoder/Bptc/Bc6EncodingHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal static int PreQuantize(float value, bool signed)
3939
}
4040

4141
/// <summary>
42-
/// Opposite of <see cref="Bc6Block.UnQuantize(int,bool)"/>
42+
/// Opposite of <see cref="Bc6Block.UnQuantize(int,int,bool)"/>
4343
/// </summary>
4444
internal static int Quantize(int component, int endpointBits, bool signed)
4545
{

BCnEncTests/CancellationTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Threading;
3+
using System.Threading.Tasks;
34
using BCnEncoder.Decoder;
45
using BCnEncTests.Support;
56
using Xunit;
@@ -9,13 +10,13 @@ namespace BCnEncTests
910
public class CancellationTests
1011
{
1112
[Fact]
12-
public async void EncodeParallelCancellation()
13+
public async Task EncodeParallelCancellation()
1314
{
1415
await TestHelper.ExecuteCancellationTest(ImageLoader.TestAlphaGradient1, true);
1516
}
1617

1718
[Fact]
18-
public async void EncodeNonParallelCancellation()
19+
public async Task EncodeNonParallelCancellation()
1920
{
2021
await TestHelper.ExecuteCancellationTest(ImageLoader.TestAlphaGradient1, false);
2122
}

BCnEncTests/DecodingAsyncTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.ComponentModel.DataAnnotations;
22
using System.IO;
3+
using System.Threading.Tasks;
34
using BCnEncoder.Decoder;
45
using BCnEncoder.Encoder;
56
using BCnEncoder.ImageSharp;
@@ -12,7 +13,7 @@ namespace BCnEncTests
1213
public class DecodingAsyncTests
1314
{
1415
[Fact]
15-
public async void DecodeAsync()
16+
public async Task DecodeAsync()
1617
{
1718
var decoder = new BcDecoder();
1819
var encoder = new BcEncoder();
@@ -26,7 +27,7 @@ public async void DecodeAsync()
2627
}
2728

2829
[Fact]
29-
public async void DecodeAllMipMapsAsync()
30+
public async Task DecodeAllMipMapsAsync()
3031
{
3132
var decoder = new BcDecoder();
3233
var encoder = new BcEncoder();
@@ -41,16 +42,16 @@ public async void DecodeAllMipMapsAsync()
4142
}
4243

4344
[Fact]
44-
public async void DecodeRawAsync()
45+
public async Task DecodeRawAsync()
4546
{
4647
var decoder = new BcDecoder();
4748
var encoder = new BcEncoder();
4849
var original = ImageLoader.TestGradient1;
4950

5051
var file = encoder.EncodeToKtx(original);
51-
52+
5253
var ms = new MemoryStream(file.MipMaps[0].Faces[0].Data);
53-
54+
5455
var image = await decoder.DecodeRawToImageRgba32Async(ms,
5556
(int) file.MipMaps[0].Width, (int) file.MipMaps[0].Height, CompressionFormat.Bc1);
5657

BCnEncTests/EncodingAsyncTest.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Threading.Tasks;
12
using BCnEncoder.Decoder;
23
using BCnEncoder.Encoder;
34
using BCnEncoder.ImageSharp;
@@ -25,7 +26,7 @@ public EncodingAsyncTest()
2526
}
2627

2728
[Fact]
28-
public async void EncodeToDdsAsync()
29+
public async Task EncodeToDdsAsync()
2930
{
3031
var file = await encoder.EncodeToDdsAsync(originalImage);
3132
var image = decoder.DecodeToImageRgba32(file);
@@ -35,7 +36,7 @@ public async void EncodeToDdsAsync()
3536
}
3637

3738
[Fact]
38-
public async void EncodeToKtxAsync()
39+
public async Task EncodeToKtxAsync()
3940
{
4041
var file = await encoder.EncodeToKtxAsync(originalImage);
4142
var image = decoder.DecodeToImageRgba32(file);
@@ -45,7 +46,7 @@ public async void EncodeToKtxAsync()
4546
}
4647

4748
[Fact]
48-
public async void EncodeCubemapToDdsAsync()
49+
public async Task EncodeCubemapToDdsAsync()
4950
{
5051
var file = await encoder.EncodeCubeMapToDdsAsync(originalCubeMap[0], originalCubeMap[1], originalCubeMap[2],
5152
originalCubeMap[3], originalCubeMap[4], originalCubeMap[5]);
@@ -60,7 +61,7 @@ public async void EncodeCubemapToDdsAsync()
6061
}
6162

6263
[Fact]
63-
public async void EncodeCubemapToKtxAsync()
64+
public async Task EncodeCubemapToKtxAsync()
6465
{
6566
var file = await encoder.EncodeCubeMapToKtxAsync(originalCubeMap[0], originalCubeMap[1], originalCubeMap[2],
6667
originalCubeMap[3], originalCubeMap[4], originalCubeMap[5]);
@@ -75,7 +76,7 @@ public async void EncodeCubemapToKtxAsync()
7576
}
7677

7778
[Fact]
78-
public async void EncodeToRawBytesAsync()
79+
public async Task EncodeToRawBytesAsync()
7980
{
8081
var data = await encoder.EncodeToRawBytesAsync(originalImage);
8182
var image = decoder.DecodeRawToImageRgba32(data[0], originalImage.Width, originalImage.Height, CompressionFormat.Bc1);

BCnEncTests/ProgressTests.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private async Task ExecuteDecodeProgressReport(BcDecoder decoder, DdsFile image,
9999
}
100100

101101
[Fact]
102-
public async void DecodeProgressReportParallel()
102+
public async Task DecodeProgressReportParallel()
103103
{
104104
var testImage = KtxLoader.TestDecompressBc1;
105105
var decoder = new BcDecoder
@@ -118,7 +118,7 @@ public async void DecodeProgressReportParallel()
118118
}
119119

120120
[Fact]
121-
public async void DecodeProgressReportNonParallel()
121+
public async Task DecodeProgressReportNonParallel()
122122
{
123123
var testImage = KtxLoader.TestDecompressBc1;
124124
var decoder = new BcDecoder
@@ -137,7 +137,7 @@ public async void DecodeProgressReportNonParallel()
137137
}
138138

139139
[Fact]
140-
public async void DecodeProgressReportParallelOneMip()
140+
public async Task DecodeProgressReportParallelOneMip()
141141
{
142142
var testImage = KtxLoader.TestDecompressBc1;
143143
var decoder = new BcDecoder
@@ -151,7 +151,7 @@ public async void DecodeProgressReportParallelOneMip()
151151
}
152152

153153
[Fact]
154-
public async void DecodeProgressReportNonParallelOneMip()
154+
public async Task DecodeProgressReportNonParallelOneMip()
155155
{
156156
var testImage = KtxLoader.TestDecompressBc1;
157157
var decoder = new BcDecoder
@@ -165,7 +165,7 @@ public async void DecodeProgressReportNonParallelOneMip()
165165
}
166166

167167
[Fact]
168-
public async void DecodeProgressReportParallelDds()
168+
public async Task DecodeProgressReportParallelDds()
169169
{
170170
var testImage = DdsLoader.TestDecompressBc1;
171171
var decoder = new BcDecoder
@@ -184,7 +184,7 @@ public async void DecodeProgressReportParallelDds()
184184
}
185185

186186
[Fact]
187-
public async void DecodeProgressReportNonParallelDds()
187+
public async Task DecodeProgressReportNonParallelDds()
188188
{
189189
var testImage = DdsLoader.TestDecompressBc1;
190190
var decoder = new BcDecoder
@@ -203,7 +203,7 @@ public async void DecodeProgressReportNonParallelDds()
203203
}
204204

205205
[Fact]
206-
public async void DecodeProgressReportParallelOneMipDds()
206+
public async Task DecodeProgressReportParallelOneMipDds()
207207
{
208208
var testImage = DdsLoader.TestDecompressBc1;
209209
var decoder = new BcDecoder
@@ -217,7 +217,7 @@ public async void DecodeProgressReportParallelOneMipDds()
217217
}
218218

219219
[Fact]
220-
public async void DecodeProgressReportNonParallelOneMipDds()
220+
public async Task DecodeProgressReportNonParallelOneMipDds()
221221
{
222222
var testImage = DdsLoader.TestDecompressBc1;
223223
var decoder = new BcDecoder
@@ -231,7 +231,7 @@ public async void DecodeProgressReportNonParallelOneMipDds()
231231
}
232232

233233
[Fact]
234-
public async void EncodeProgressReportParallelKtx()
234+
public async Task EncodeProgressReportParallelKtx()
235235
{
236236
var testImage = ImageLoader.TestBlur1;
237237
var encoder = new BcEncoder
@@ -252,7 +252,7 @@ public async void EncodeProgressReportParallelKtx()
252252
}
253253

254254
[Fact]
255-
public async void EncodeProgressReportNonParallelKtx()
255+
public async Task EncodeProgressReportNonParallelKtx()
256256
{
257257
var testImage = ImageLoader.TestBlur1;
258258
var encoder = new BcEncoder
@@ -273,7 +273,7 @@ public async void EncodeProgressReportNonParallelKtx()
273273
}
274274

275275
[Fact]
276-
public async void EncodeProgressReportParallelOneMipKtx()
276+
public async Task EncodeProgressReportParallelOneMipKtx()
277277
{
278278
var testImage = ImageLoader.TestBlur1;
279279
var encoder = new BcEncoder
@@ -288,7 +288,7 @@ public async void EncodeProgressReportParallelOneMipKtx()
288288
}
289289

290290
[Fact]
291-
public async void EncodeProgressReportNonParallelOneMipKtx()
291+
public async Task EncodeProgressReportNonParallelOneMipKtx()
292292
{
293293
var testImage = ImageLoader.TestBlur1;
294294
var encoder = new BcEncoder
@@ -303,7 +303,7 @@ public async void EncodeProgressReportNonParallelOneMipKtx()
303303
}
304304

305305
[Fact]
306-
public async void EncodeProgressReportParallelDds()
306+
public async Task EncodeProgressReportParallelDds()
307307
{
308308
var testImage = ImageLoader.TestBlur1;
309309
var encoder = new BcEncoder
@@ -324,7 +324,7 @@ public async void EncodeProgressReportParallelDds()
324324
}
325325

326326
[Fact]
327-
public async void EncodeProgressReportNonParallelDds()
327+
public async Task EncodeProgressReportNonParallelDds()
328328
{
329329
var testImage = ImageLoader.TestBlur1;
330330
var encoder = new BcEncoder
@@ -345,7 +345,7 @@ public async void EncodeProgressReportNonParallelDds()
345345
}
346346

347347
[Fact]
348-
public async void EncodeProgressReportParallelOneMipDds()
348+
public async Task EncodeProgressReportParallelOneMipDds()
349349
{
350350
var testImage = ImageLoader.TestBlur1;
351351
var encoder = new BcEncoder
@@ -360,7 +360,7 @@ public async void EncodeProgressReportParallelOneMipDds()
360360
}
361361

362362
[Fact]
363-
public async void EncodeProgressReportNonParallelOneMipDds()
363+
public async Task EncodeProgressReportNonParallelOneMipDds()
364364
{
365365
var testImage = ImageLoader.TestBlur1;
366366
var encoder = new BcEncoder

BCnEncoder.NET.ImageSharp/BCnEncoderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public static Task<byte[][]> EncodeToRawBytesAsync(this BcEncoder encoder, Image
192192
/// <param name="mipLevel">The mipmap to encode.</param>
193193
/// <param name="token">The cancellation token for this operation. Can be default, if the operation is not asynchronous.</param>
194194
/// <returns>The raw encoded data.</returns>
195-
/// <remarks>To get the width and height of the encoded mipLevel, see <see cref="CalculateMipMapSize(Image{Rgba32},int,out int,out int)"/>.</remarks>
195+
/// <remarks>To get the width and height of the encoded mipLevel, see <see cref="CalculateMipMapSize"/>.</remarks>
196196
public static Task<byte[]> EncodeToRawBytesAsync(this BcEncoder encoder, Image<Rgba32> inputImage, int mipLevel, CancellationToken token = default)
197197
{
198198
return encoder.EncodeToRawBytesAsync(ImageToMemory2D(inputImage), mipLevel, token);

0 commit comments

Comments
 (0)