Support swift 4.1.

kawoou · Apr 10, 2018 · add9345 · add9345
1 parent fb6a4a7
commit add9345
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/Examples/Example-app-macOS/Example-app-macOS/ViewController.swift b/Examples/Example-app-macOS/Example-app-macOS/ViewController.swift
@@ -197,7 +197,11 @@ class ViewController: NSViewController, NSComboBoxDataSource {
         self.sizeCG.stringValue = "\(cgSize.width)x\(cgSize.height)"
     }
     @IBAction func resetClicked(_ sender: NSButton) {
+        #if swift(>=4.0)
+        let image = NSImage(named: NSImage.Name("macaron.jpg"))
+        #else
         let image = NSImage(named: "macaron.jpg")
+        #endif
 
         self.imageMetal.image = image
         self.imageCG.image = image

diff --git a/Sources/Device/ImageMetalDevice.swift b/Sources/Device/ImageMetalDevice.swift
@@ -47,7 +47,13 @@
             /// Alloc Memory
             let memorySize = width * height * 4
             let memoryPool = UnsafeMutablePointer<UInt8>.allocate(capacity: memorySize)
-            defer { memoryPool.deallocate(capacity: memorySize) }
+            defer {
+                #if swift(>=4.1)
+                memoryPool.deallocate()
+                #else
+                memoryPool.deallocate(capacity: memorySize)
+                #endif
+            }
             memset(memoryPool, 0, memorySize)
 
             /// Create Context
@@ -176,7 +182,13 @@
 
             let memorySize = width * height * 4
             let memoryPool = UnsafeMutablePointer<UInt8>.allocate(capacity: memorySize)
-            defer { memoryPool.deallocate(capacity: memorySize) }
+            defer {
+                #if swift(>=4.1)
+                memoryPool.deallocate()
+                #else
+                memoryPool.deallocate(capacity: memorySize)
+                #endif
+            }
 
             texture.getBytes(
                 memoryPool,

diff --git a/Sources/Device/ImageNoneDevice.swift b/Sources/Device/ImageNoneDevice.swift
@@ -63,7 +63,11 @@ internal class ImageNoneDevice: ImageDevice {
         /// Push Context
         guard let context = self.context else {
             self.drawRect = nil
+            #if swift(>=4.1)
+            self.memoryPool!.deallocate()
+            #else
             self.memoryPool!.deallocate(capacity: self.memorySize!)
+            #endif
 
             self.memorySize = nil
             self.memoryPool = nil
@@ -138,7 +142,11 @@ internal class ImageNoneDevice: ImageDevice {
         guard let context = self.context else { return nil }
         defer {
             self.drawRect = nil
+            #if swift(>=4.1)
+            self.memoryPool!.deallocate()
+            #else
             self.memoryPool!.deallocate(capacity: self.memorySize!)
+            #endif
 
             self.memorySize = nil
             self.memoryPool = nil

diff --git a/Sources/Filter/BlurFilter.swift b/Sources/Filter/BlurFilter.swift
@@ -54,7 +54,13 @@
                 }
 
                 let rawData = UnsafeMutablePointer<Float>.allocate(capacity: size * size)
-                defer { rawData.deallocate(capacity: size * size) }
+                defer {
+                    #if swift(>=4.1)
+                    rawData.deallocate()
+                    #else
+                    rawData.deallocate(capacity: size * size)
+                    #endif
+                }
 
                 var weightSum = Float(0)
                 var y = -self.radius
@@ -183,7 +189,13 @@
             /// Alloc Memory
             let destMemorySize = width * height * 4
             let destMemoryPool = UnsafeMutablePointer<UInt8>.allocate(capacity: destMemorySize)
-            defer { destMemoryPool.deallocate(capacity: destMemorySize) }
+            defer {
+                #if swift(>=4.1)
+                destMemoryPool.deallocate()
+                #else
+                destMemoryPool.deallocate(capacity: destMemorySize)
+                #endif
+            }
             memcpy(destMemoryPool, memoryPool, destMemorySize)
 
             /// Destination Buffer

diff --git a/Sources/Filter/TextureAppendFilter.swift b/Sources/Filter/TextureAppendFilter.swift
@@ -59,7 +59,13 @@ internal class TextureAppendFilter: ImageFilter {
             let memorySize = bytesPerRow * height
 
             let memoryPool = UnsafeMutablePointer<UInt8>.allocate(capacity: memorySize)
-            defer { memoryPool.deallocate(capacity: memorySize) }
+            defer {
+                #if swift(>=4.1)
+                memoryPool.deallocate()
+                #else
+                memoryPool.deallocate(capacity: memorySize)
+                #endif
+            }
             memset(memoryPool, 0, memorySize)
 
             /// Create Context