Skip to content

Commit 0f9fbd9

Browse files
committed
updates from deprecated types to latest swift-png 4.4 types
1 parent cba5912 commit 0f9fbd9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Tests/NoiseTests/calibrate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func grayscale_noise_png(noise:Noise, width:Int, height:Int, value_offset:Double
1313

1414
do
1515
{
16-
let image:PNG.Data.Rectangular = .init(packing: v, size: (width, height),
16+
let image:PNG.Image = .init(packing: v, size: (width, height),
1717
layout: .init(format: .v8(fill: nil, key: nil)))
1818
try image.compress(path: path, level: 9)
1919
}

Tests/NoiseTests/main.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func benchmark<Generator>(noise generator:Generator, name:String, offset:Double
3030
}
3131
print("\(name): \(clock() - t0)")
3232

33-
let image:PNG.Data.Rectangular = .init(packing: pixbuf, size: (viewer_size, viewer_size),
33+
let image:PNG.Image = .init(packing: pixbuf, size: (viewer_size, viewer_size),
3434
layout: .init(format: .v8(fill: nil, key: nil)))
3535
try image.compress(path: "tests/\(name).png", level: 9)
3636
}
@@ -42,7 +42,7 @@ for point:(x:Double, y:Double) in poisson.generate(radius: 10, width: viewer_siz
4242
pixbuf[Int(point.y) * viewer_size + Int(point.x)] = 255
4343
}
4444
print("disk2d: \(clock() - t0)")
45-
let image:PNG.Data.Rectangular = .init(packing: pixbuf, size: (viewer_size, viewer_size),
45+
let image:PNG.Image = .init(packing: pixbuf, size: (viewer_size, viewer_size),
4646
layout: .init(format: .v8(fill: nil, key: nil)))
4747
try image.compress(path: "tests/disk2d.png", level: 9)
4848

Tests/NoiseTests/tests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func color_noise_png(r_noise:Noise, g_noise:Noise, b_noise:Noise,
3232

3333
do
3434
{
35-
let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height),
35+
let image:PNG.Image = .init(packing: rgba, size: (width, height),
3636
layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
3737
try image.compress(path: path, level: 9)
3838
}
@@ -175,7 +175,7 @@ func banner_disk2d(width:Int, height:Int, seed:Int)
175175

176176
do
177177
{
178-
let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height),
178+
let image:PNG.Image = .init(packing: rgba, size: (width, height),
179179
layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
180180
try image.compress(path: "tests/banner_disk2d.png", level: 9)
181181
}
@@ -230,7 +230,7 @@ func banner_voronoi2d(width:Int, height:Int, seed:Int)
230230

231231
do
232232
{
233-
let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height),
233+
let image:PNG.Image = .init(packing: rgba, size: (width, height),
234234
layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
235235
try image.compress(path: "tests/banner_voronoi2d.png", level: 9)
236236
}

0 commit comments

Comments
 (0)