Bladeren bron

Use >> instead of |> for concat processor

onevcat 9 jaren geleden
bovenliggende
commit
dc9a8887df
2 gewijzigde bestanden met toevoegingen van 9 en 11 verwijderingen
  1. 7 9
      Sources/ImageProcessor.swift
  2. 2 2
      Tests/KingfisherTests/ImageProcessorTests.swift

+ 7 - 9
Sources/ImageProcessor.swift

@@ -156,7 +156,7 @@ public struct RoundCornerImageProcessor: ImageProcessor {
             let size = targetSize ?? image.kf_size
             return image.kf_image(withRoundRadius: cornerRadius, fit: size, scale: options.scaleFactor)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -183,7 +183,7 @@ public struct ResizingImageProcessor: ImageProcessor {
         case .image(let image):
             return image.kf_resize(to: targetSize)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -212,7 +212,7 @@ public struct BlurImageProcessor: ImageProcessor {
             let radius = blurRadius * options.scaleFactor
             return image.kf_blurred(withRadius: radius)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -246,7 +246,7 @@ public struct OverlayImageProcessor: ImageProcessor {
         case .image(let image):
             return image.kf_overlaying(with: overlay, fraction: fraction)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -274,7 +274,7 @@ public struct TintImageProcessor: ImageProcessor {
         case .image(let image):
             return image.kf_tinted(with: tint)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -318,7 +318,7 @@ public struct ColorControlsProcessor: ImageProcessor {
         case .image(let image):
             return image.kf_adjusted(brightness: brightness, contrast: contrast, saturation: saturation, inputEV: inputEV)
         case .data(_):
-            return (DefaultImageProcessor() |> self).process(item: item, options: options)
+            return (DefaultImageProcessor() >> self).process(item: item, options: options)
         }
     }
 }
@@ -339,15 +339,13 @@ public struct BlackWhiteProcessor: ImageProcessor {
     }
 }
 
-infix operator |>: AdditionPrecedence
-
 /// Concatenate two `ImageProcessor`s. `ImageProcessor.appen(another:)` is used internally.
 ///
 /// - parameter left:  First processor.
 /// - parameter right: Second processor.
 ///
 /// - returns: The concatenated processor.
-public func |>(left: ImageProcessor, right: ImageProcessor) -> ImageProcessor {
+public func >>(left: ImageProcessor, right: ImageProcessor) -> ImageProcessor {
     return left.append(another: right)
 }
 

+ 2 - 2
Tests/KingfisherTests/ImageProcessorTests.swift

@@ -111,7 +111,7 @@ class ImageProcessorTests: XCTestCase {
     }
 
     func testCompositionProcessor() {
-        let p = BlurImageProcessor(blurRadius: 4) |> RoundCornerImageProcessor(cornerRadius: 60)
+        let p = BlurImageProcessor(blurRadius: 4) >> RoundCornerImageProcessor(cornerRadius: 60)
         XCTAssertEqual(p.identifier, "com.onevcat.Kingfisher.BlurImageProcessor(4.0)|>com.onevcat.Kingfisher.RoundCornerImageProcessor(60.0)")
         // Alpha convolving would vary due to context. So we do not test blur for PNGs.
         // See results in Resource folder.
@@ -167,7 +167,7 @@ extension ImageProcessorTests {
     //Helper Writer
     func _testWrite() {
         
-        let p = BlurImageProcessor(blurRadius: 4) |> RoundCornerImageProcessor(cornerRadius: 60)
+        let p = BlurImageProcessor(blurRadius: 4) >> RoundCornerImageProcessor(cornerRadius: 60)
         let suffix = "blur-4-round-corner-60-mac"
         let resultImages = imageData().flatMap { p.process(item: .data($0), options: []) }
         for i in 0..<resultImages.count {