Update Podspec to 2.0.1

Tangdixi · May 3, 2017 · c84a7af · c84a7af
1 parent 18dee6c
commit c84a7af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/DCQRCode.podspec.json b/DCQRCode.podspec.json
@@ -15,7 +15,8 @@
   },
   "source": {
     "git": "https://github.com/Tangdixi/DCQRCode.git",
-    "tag": "2.0.1"
+    "tag": "2.0.1",
+    "branch": "master"
   },
   "source_files": "Source/*.swift",
   "requires_arc": true

diff --git a/Source/DCQRCode.swift b/Source/DCQRCode.swift
@@ -37,7 +37,7 @@ final class DCQRCode {
   /**
     The main color of QRCode, default is __Black__
    */
-  var color = UIColor.black
+  // var color = UIColor.black
 
   /**
     Blend an image into the QRCode. The image will scale and fill the QRCode
@@ -89,10 +89,7 @@ final class DCQRCode {
 
     /* Start from a white blank image */
     let originImage = CIImage.empty()
-    //    var filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(topColor, color1: bottomColor)
-    var filter = generateQRCodeFilter(self.info)
-    filter = filter >>> resizeFilter(self.size)
-    filter = filter >>> falseColorFilter(topColor, color1: bottomColor)
+		var filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(topColor, color1: bottomColor)
 
     /* Processing through Core Image */
     if let maskImage = self.maskImage {
@@ -228,24 +225,16 @@ extension DCQRCode {
   fileprivate func generateAlphaQRCode() -> CIImage {
 
     let originImage = CIImage.empty()
-//    let filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(UIColor.black, color1: UIColor.white) >>> maskToAlphaFilter()
-    var filter = generateQRCodeFilter(self.info)
-    filter = filter >>> resizeFilter(self.size)
-    filter = filter >>> falseColorFilter(UIColor.white, color1: UIColor.black)
-    filter = filter >>> maskToAlphaFilter()
-    let image = filter(originImage)
+    let filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(UIColor.black, color1: UIColor.white) >>> maskToAlphaFilter()
+		let image = filter(originImage)
     return image
 
   }
 
   fileprivate func generateReverseAlphaQRCode() -> CIImage {
 
     let originImage = CIImage.empty()
-//    let filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(UIColor.white, color1: UIColor.black) >>> maskToAlphaFilter()
-    var filter = generateQRCodeFilter(self.info)
-    filter = filter >>> resizeFilter(self.size)
-    filter = filter >>> falseColorFilter(UIColor.white, color1: UIColor.black)
-    filter = filter >>> maskToAlphaFilter()
+    let filter = generateQRCodeFilter(self.info) >>> resizeFilter(self.size) >>> falseColorFilter(UIColor.white, color1: UIColor.black) >>> maskToAlphaFilter()
     let image = filter(originImage)
     return image
 

diff --git a/Source/FunctionalCoreImage.swift b/Source/FunctionalCoreImage.swift
@@ -12,7 +12,12 @@ import UIKit
 
 typealias Filter = ((CIImage) -> CIImage)
 
-infix operator >>> { associativity left }
+infix operator >>> : DCQRCodePrecedence
+precedencegroup DCQRCodePrecedence {
+	associativity: left
+	higherThan: AdditionPrecedence
+	lowerThan: MultiplicationPrecedence
+}
 
 func >>>(firstFilter: @escaping Filter, secondFilter: @escaping Filter) -> Filter {
   return { image in