Skip to content

Commit c1f5109

Browse files
committed
[PixImageMipMap] Rename Count to LevelCount
1 parent 4fb33e8 commit c1f5109

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

src/Aardvark.Base.Tensors.CSharp/PixImage/PixImageMipMap.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public class PixImageMipMap
3636
/// <summary>
3737
/// Number of images in the mipmap array.
3838
/// </summary>
39-
public int Count => ImageArray?.Length ?? 0;
39+
public int LevelCount => ImageArray?.Length ?? 0;
4040

4141
/// <summary>
4242
/// Returns the base image of the mipmap array or null if it is empty.
4343
/// </summary>
44-
public PixImage BaseImage => Count > 0 ? ImageArray[0] : null;
44+
public PixImage BaseImage => LevelCount > 0 ? ImageArray[0] : null;
4545

4646
/// <summary>
4747
/// Returns the size of the base image, or V2i.Zero if the mipmap array is empty.
@@ -65,11 +65,8 @@ public PixImage this[int index]
6565

6666
#region Obsolete
6767

68-
[Obsolete("Use Count instead.")]
69-
public int LevelCount => Count;
70-
71-
[Obsolete("Use Count instead.")]
72-
public int ImageCount => Count;
68+
[Obsolete("Use LevelCount instead.")]
69+
public int ImageCount => LevelCount;
7370

7471
[Obsolete("Use ImageArray instead.")]
7572
public PixImage[] Images => ImageArray;

src/Tests/Aardvark.Base.Tests/Images/PixImageTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,55 @@ public void MipMapCreate1x1()
1818
{
1919
var pix = new PixImage<byte>(1, 1, 4);
2020
var mip = PixImageMipMap.Create(pix);
21-
Assert.IsTrue(mip.Count == 1);
21+
Assert.IsTrue(mip.LevelCount == 1);
2222
}
2323

2424
[Test]
2525
public void MipMapCreate2x2()
2626
{
2727
var pix = new PixImage<byte>(2, 2, 4);
2828
var mip = PixImageMipMap.Create(pix);
29-
Assert.IsTrue(mip.Count == 2);
29+
Assert.IsTrue(mip.LevelCount == 2);
3030
}
3131

3232
[Test]
3333
public void MipMapCreate3x3()
3434
{
3535
var pix = new PixImage<byte>(3, 3, 4);
3636
var mip = PixImageMipMap.Create(pix);
37-
Assert.IsTrue(mip.Count == 2);
37+
Assert.IsTrue(mip.LevelCount == 2);
3838
}
3939

4040
[Test]
4141
public void MipMapCreate256()
4242
{
4343
var pix = new PixImage<byte>(256, 256, 4);
4444
var mip = PixImageMipMap.Create(pix);
45-
Assert.IsTrue(mip.Count == 9);
45+
Assert.IsTrue(mip.LevelCount == 9);
4646
}
4747

4848
[Test]
4949
public void MipMapCreate255()
5050
{
5151
var pix = new PixImage<byte>(255, 255, 4);
5252
var mip = PixImageMipMap.Create(pix);
53-
Assert.IsTrue(mip.Count == 8);
53+
Assert.IsTrue(mip.LevelCount == 8);
5454
}
5555

5656
[Test]
5757
public void MipMapCreate257()
5858
{
5959
var pix = new PixImage<byte>(257, 257, 4);
6060
var mip = PixImageMipMap.Create(pix);
61-
Assert.IsTrue(mip.Count == 9);
61+
Assert.IsTrue(mip.LevelCount == 9);
6262
}
6363

6464
[Test]
6565
public void MipMapCreate57x43()
6666
{
6767
var pix = new PixImage<byte>(57, 43, 4);
6868
var mip = PixImageMipMap.Create(pix);
69-
Assert.IsTrue(mip.Count == 6);
69+
Assert.IsTrue(mip.LevelCount == 6);
7070
//level 0: 57x43
7171
//level 1: 28x21
7272
//level 2: 14x10
@@ -80,7 +80,7 @@ public void MipMapCreate57x11()
8080
{
8181
var pix = new PixImage<byte>(57, 11, 4);
8282
var mip = PixImageMipMap.Create(pix);
83-
Assert.IsTrue(mip.Count == 6);
83+
Assert.IsTrue(mip.LevelCount == 6);
8484
//level 0: 57x11
8585
//level 1: 28x5
8686
//level 2: 14x2

0 commit comments

Comments
 (0)