Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
xcodebuild build-for-testing
-project Compositor.xcodeproj
-scheme Compositor
-destination 'platform=macOS'
-destination 'platform=macOS,arch=arm64'
-configuration Debug
-derivedDataPath DerivedData
CODE_SIGN_IDENTITY=-
Expand All @@ -49,7 +49,7 @@ jobs:
xcodebuild test-without-building
-project Compositor.xcodeproj
-scheme Compositor
-destination 'platform=macOS'
-destination 'platform=macOS,arch=arm64'
-derivedDataPath DerivedData
-resultBundlePath ParallelResults.xcresult
-parallel-testing-enabled YES
Expand All @@ -62,7 +62,7 @@ jobs:
xcodebuild test-without-building
-project Compositor.xcodeproj
-scheme Compositor
-destination 'platform=macOS'
-destination 'platform=macOS,arch=arm64'
-derivedDataPath DerivedData
-resultBundlePath SerialResults.xcresult
-parallel-testing-enabled NO
Expand Down
5 changes: 3 additions & 2 deletions CompositorTests/TiledLayerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,12 @@ struct TiledLayerTests {
session.brushSettings.diameter = 30

struct Snapshot { let bytes: [UInt8]; let width: Int; let height: Int; let rowBytes: Int; let samples: Int }
struct SnapshotUnavailable: Error {}
func snapshot() throws -> Snapshot {
view.synchronizeDisplay()
let rep = try #require(view.bitmapImageRepForCachingDisplay(in: view.bounds))
guard let rep = view.bitmapImageRepForCachingDisplay(in: view.bounds) else { throw SnapshotUnavailable() }
view.cacheDisplay(in: view.bounds, to: rep)
let data = try #require(rep.bitmapData)
guard let data = rep.bitmapData else { throw SnapshotUnavailable() }
return Snapshot(bytes: Array(UnsafeBufferPointer(start: data, count: rep.bytesPerRow * rep.pixelsHigh)),
width: rep.pixelsWide, height: rep.pixelsHigh, rowBytes: rep.bytesPerRow, samples: rep.bitsPerPixel / 8)
}
Expand Down
34 changes: 17 additions & 17 deletions Config/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,6 @@
<key>LSTypeIsPackage</key>
<true/>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.image</string>
</array>
<key>UTTypeDescription</key>
<string>Adobe Photoshop Large Document</string>
<key>UTTypeIdentifier</key>
<string>com.adobe.photoshop-large-image</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>psb</string>
</array>
</dict>
</dict>
</array>
<key>SUEnableInstallerLauncherService</key>
<true/>
Expand Down Expand Up @@ -112,6 +95,23 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.image</string>
</array>
<key>UTTypeDescription</key>
<string>Adobe Photoshop Large Document</string>
<key>UTTypeIdentifier</key>
<string>com.adobe.photoshop-large-image</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>psb</string>
</array>
</dict>
</dict>
</array>
</dict>
</plist>